Was all that renaming necessary?