refactor all the systems to use a similar naming convention as components to cut down on the DI deps list;