Rename classes for specificity