I'm not sure - I sort of blindly copied the ui-refactoring branch so that the delta between this and that would contain no renames. If we want to do more renames it might be easiest to get ui-refactoring squashed & rebased first.