Refactored names of classes to something shorter and more suggestive