Renamed Guice specific classes to more describing name.