tweaked naming of class.