reworked all names according google code policy