Fixes class naming for consistency