clarify extended naming scheme, minor refinements