Tiny ocd renaming