Updating main branch

Creating a pull request for commenting ability
Use noun or noun phrase (https://engdoc.corp.google.com/eng/doc/devguide/java/styleguide.shtml?cl=head#s5.2.2-class-names)