Shortening names for the refactored class