Minor class renaming