rest of renaming of patterns