Classical-oriented naming

in lieu of Classical-oriented tagging