Fix name inconsistency of classes