Change inconsistent class definitions