Fixes after renaming