Merge "- rename pts_ns.yaml"