#1036 Undo some greedy renaming