Rename class to match change of method location