Makes class naming more consistent