Better renaming now. Still working.