Revert "classifier name consistency"

This reverts commit 24656b3f02179b2b95357d9cf929c25b7f5aa57b.