fix inconsistent class declarations