Renamed some objects due to google rules