Fixes after renaming files
More fixes to file renames