massive renaming complete and testing again