Added name/reference/label/selector scoping pass.