fix naming of classes