Fixes class naming scheme for consistency