Fixes after class renaming