Rename a class and remove some printlns.