fix everything after renaming stuff