Rename classes for consistency