diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index df1bb70..fa36c54 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -1776,7 +1776,7 @@ PyCursesWindow_getstr(TyObject *op, TyObject *args)
 
     if (rtn == ERR) {
         Ty_DECREF(res);
-        return Ty_GetConstant(Py_CONSTANT_EMPTY_BYTES);
+        return Ty_GetConstant(Ty_CONSTANT_EMPTY_BYTES);
     }
     _TyBytes_Resize(&res, strlen(buf));  // 'res' is set to NULL on failure
     return res;
@@ -1951,7 +1951,7 @@ PyCursesWindow_instr(TyObject *op, TyObject *args)
 
     if (rtn == ERR) {
         Ty_DECREF(res);
-        return Ty_GetConstant(Py_CONSTANT_EMPTY_BYTES);
+        return Ty_GetConstant(Ty_CONSTANT_EMPTY_BYTES);
     }
     _TyBytes_Resize(&res, strlen(buf));  // 'res' is set to NULL on failure
     return res;
diff --git a/Modules/main.c b/Modules/main.c
index 46ee776..74015b2 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -531,10 +531,10 @@ static void
 pymain_set_inspect(PyConfig *config, int inspect)
 {
     config->inspect = inspect;
-_Py_COMP_DIAG_PUSH
-_Py_COMP_DIAG_IGNORE_DEPR_DECLS
+_Ty_COMP_DIAG_PUSH
+_Ty_COMP_DIAG_IGNORE_DEPR_DECLS
     Ty_InspectFlag = inspect;
-_Py_COMP_DIAG_POP
+_Ty_COMP_DIAG_POP
 }
 
 
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index fed6617..b39c0eb 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -5869,7 +5869,7 @@ socket_gethostname(TyObject *self, TyObject *unused)
         return TyErr_SetFromWindowsErr(0);
 
     if (size == 0)
-        return Ty_GetConstant(Py_CONSTANT_EMPTY_STR);
+        return Ty_GetConstant(Ty_CONSTANT_EMPTY_STR);
 
     /* MSDN says ERROR_MORE_DATA may occur because DNS allows longer
        names */
diff --git a/Objects/longobject.c b/Objects/longobject.c
index 4cf8f82..1fb402e 100644
--- a/Objects/longobject.c
+++ b/Objects/longobject.c
@@ -2281,7 +2281,7 @@ long_format_binary(TyObject *aa, int base, int alternate,
         bits = 1;
         break;
     default:
-        Py_UNREACHABLE();
+        Ty_UNREACHABLE();
     }
 
     /* Compute exact length 'sz' of output string. */
@@ -5550,7 +5550,7 @@ long_bitwise(PyLongObject *a,
         size_z = negb ? size_b : size_a;
         break;
     default:
-        Py_UNREACHABLE();
+        Ty_UNREACHABLE();
     }
 
     /* We allow an extra digit if z is negative, to make sure that
@@ -5577,7 +5577,7 @@ long_bitwise(PyLongObject *a,
             z->long_value.ob_digit[i] = a->long_value.ob_digit[i] ^ b->long_value.ob_digit[i];
         break;
     default:
-        Py_UNREACHABLE();
+        Ty_UNREACHABLE();
     }
 
     /* Copy any remaining digits of a, inverting if necessary. */
diff --git a/Parser/action_helpers.c b/Parser/action_helpers.c
index 328ce8f..04b670a 100644
--- a/Parser/action_helpers.c
+++ b/Parser/action_helpers.c
@@ -151,7 +151,7 @@ _TyPegen_seq_count_dots(asdl_seq *seq)
                 number_of_dots += 1;
                 break;
             default:
-                Py_UNREACHABLE();
+                Ty_UNREACHABLE();
         }
     }
 
@@ -1604,7 +1604,7 @@ _build_concatenated_bytes(Parser *p, asdl_expr_seq *strings, int lineno,
     Ty_ssize_t len = asdl_seq_LEN(strings);
     assert(len > 0);
 
-    TyObject* res = Ty_GetConstant(Py_CONSTANT_EMPTY_BYTES);
+    TyObject* res = Ty_GetConstant(Ty_CONSTANT_EMPTY_BYTES);
 
     /* Bytes literals never get a kind, but just for consistency
         since they are represented as Constant nodes, we'll mirror
diff --git a/Parser/parser.c b/Parser/parser.c
index 43a7539..ceb999d 100644
--- a/Parser/parser.c
+++ b/Parser/parser.c
@@ -38040,13 +38040,13 @@ _TyPegen_parse(Parser *p)
 
     // Run parser
     void *result = NULL;
-    if (p->start_rule == Py_file_input) {
+    if (p->start_rule == Ty_file_input) {
         result = file_rule(p);
-    } else if (p->start_rule == Py_single_input) {
+    } else if (p->start_rule == Ty_single_input) {
         result = interactive_rule(p);
-    } else if (p->start_rule == Py_eval_input) {
+    } else if (p->start_rule == Ty_eval_input) {
         result = eval_rule(p);
-    } else if (p->start_rule == Py_func_type_input) {
+    } else if (p->start_rule == Ty_func_type_input) {
         result = func_type_rule(p);
     }
 
diff --git a/Python/ast.c b/Python/ast.c
index ef90e92..b806327 100644
--- a/Python/ast.c
+++ b/Python/ast.c
@@ -127,7 +127,7 @@ expr_context_name(expr_context_ty ctx)
         return "Del";
     // No default case so compiler emits warning for unhandled cases
     }
-    Py_UNREACHABLE();
+    Ty_UNREACHABLE();
 }
 
 static int
diff --git a/Python/context.c b/Python/context.c
index 4d698c6..34f57c0 100644
--- a/Python/context.c
+++ b/Python/context.c
@@ -107,7 +107,7 @@ context_event_name(PyContextEvent event) {
         default:
             return "?";
     }
-    Py_UNREACHABLE();
+    Ty_UNREACHABLE();
 }
 
 static void