Name updates needed from refactoring