fixes after renaming