renaming - first pass