Porting changes from our projects
Minor fix for rename generator