updating naming conventions and instantiating objects constructor injection.