renaming according to google style