Remove guice
Renaming