Cleaning up more edge-case names.