rollback extended naming scheme for lack of orthogonality