Fixed commands class names