Quick, sensible refactor of naming conventions and dep injection.