Cleanup: Shorter names for internal classes