Correct renaming and it compiles with fixed renumbering