fix config setting naming

Author: aignas

python/private/py_toolchain_suite.bzl

@@ -44,8 +44,12 @@ def py_toolchain_suite(*, prefix, user_repository_name, python_version, set_pyth
         major_minor, _, _ = python_version.rpartition(".")
 
         match_any = []
-        for v in [major_minor, python_version]:
-            name = prefix + "_{}".format(prefix, v)
+        for i, v in enumerate([major_minor, python_version]):
+            name = "{prefix}_{python_version}_{i}".format(
+                prefix = prefix,
+                python_version = python_version,
+                i = i,
+            )
             match_any.append(name)
             if flag_values:
                 is_python_config_setting(
@@ -58,23 +62,30 @@ def py_toolchain_suite(*, prefix, user_repository_name, python_version, set_pyth
                 native.alias(
                     name = name,
                     actual = Label("//python/config_settings:is_python_%s" % v),
+                    visibility = ["//visibility:private"],
                 )
 
+        name = "{prefix}_version_setting_{python_version}".format(
+            prefix = prefix,
+            python_version = python_version,
+            visibility = ["//visibility:private"],
+        )
         selects.config_setting_group(
-            name = prefix + "_version_setting",
+            name = name,
             match_any = match_any,
             visibility = ["//visibility:private"],
         )
-        target_settings = [prefix + "_version_setting"]
+        target_settings = [name]
     elif set_python_version_constraint == "False":
+        name = "{prefix}_version_setting_default".format(prefix = prefix)
         native.config_setting(
-            name = prefix + "_version_setting_default",
+            name = name,
             flag_values = flag_values | {
                 Label("//python/config_settings:python_version"): "",
             },
             visibility = ["//visibility:private"],
         )
-        target_settings = [prefix + "_version_setting_default"]
+        target_settings = [name]
     else:
         fail(("Invalid set_python_version_constraint value: got {} {}, wanted " +
               "either the string 'True' or the string 'False'; " +