Changed some classes to dash separated format