Fixing the rename generator
Few fixes and enhancements