Update class naming to match google style guide