Renaming solution