rename classes to keep consistency