update some class declarations for the class naming fix