Finish name change and bit of refactoring