The big rename.
Plus eliminate a debug print.