Renaming solution and cleaning up