Rename classes for upcoming changes