updated class names to make them less generic