rename classes per convention/authority