Easier Rename

Already done for Opus 12. :slight_smile: