Changed name of classes to be less cryptic.