Ctrl-P, Ctrl-Shift-P: Fix names