Rename some classes, fix a silly nullpointer.