Replaced all Base- in class names with Abstract-