Refactor naming to better identify class in use