Rename stuff. Remove debug output.