changed names of classes to stay standardized