Several fixes regarding renaming