fixup! classicnaming: test collide with r branches
fixup! extract ClassicNaming