Naming of the class was somewhat erratic.