renaming and smarter strategy