updated class names with prefix