reworked names according google code policy