Refactored names of type declaration classes