Rename + cosmetic