Rename a couple of classes to be consistent