clean(*): renaming