diff --git a/py/obj.c b/py/obj.c
index b7b1d35adf..fd11ddf9cd 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -575,7 +575,7 @@ mp_obj_t mp_obj_len_maybe(mp_obj_t o_in) {
 
 mp_obj_t mp_obj_subscr(mp_obj_t base, mp_obj_t index, mp_obj_t value) {
     const mp_obj_type_t *type = mp_obj_get_type(base);
-    mp_subscr_fun_t subscr = mp_type_subscr(type);
+    mp_subscr_fun_t subscr = mp_type_get_subscr_slot(type);
     if (subscr != NULL) {
         mp_obj_t ret = subscr(base, index, value);
         // May have called port specific C code. Make sure it didn't mess up the heap.
@@ -706,7 +706,7 @@ mp_attr_fun_t mp_type_attr(const mp_obj_type_t *type) {
 }
 
 
-mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *type) {
+mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *type) {
     if (!(type->flags & MP_TYPE_FLAG_EXTENDED)) {
         return NULL;
     }
diff --git a/py/obj.h b/py/obj.h
index 70891fb768..0d12b99ecc 100644
--- a/py/obj.h
+++ b/py/obj.h
@@ -665,7 +665,7 @@ struct _mp_obj_full_type_t {
 extern mp_call_fun_t mp_type_get_call_slot(const mp_obj_type_t *);
 extern mp_unary_op_fun_t mp_type_get_unary_op_slot(const mp_obj_type_t *);
 extern mp_binary_op_fun_t mp_type_get_binary_op_slot(const mp_obj_type_t *);
-extern mp_subscr_fun_t mp_type_subscr(const mp_obj_type_t *);
+extern mp_subscr_fun_t mp_type_get_subscr_slot(const mp_obj_type_t *);
 extern mp_getiter_fun_t mp_type_getiter(const mp_obj_type_t *);
 extern mp_fun_1_t mp_type_iternext(const mp_obj_type_t *);
 extern mp_getbuffer_fun_t mp_type_getbuffer(const mp_obj_type_t *);
diff --git a/py/objarray.c b/py/objarray.c
index 50b977914f..eea1a97c1d 100644
--- a/py/objarray.c
+++ b/py/objarray.c
@@ -564,7 +564,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                 size_t src_len;
                 void *src_items;
                 size_t item_sz = mp_binary_get_size('@', o->typecode & TYPECODE_MASK, NULL);
-                if (mp_obj_is_obj(value) && mp_type_subscr(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type) == array_subscr) {
+                if (mp_obj_is_obj(value) && mp_type_get_subscr_slot(((mp_obj_base_t *)MP_OBJ_TO_PTR(value))->type) == array_subscr) {
                     // value is array, bytearray or memoryview
                     mp_obj_array_t *src_slice = MP_OBJ_TO_PTR(value);
                     if (item_sz != mp_binary_get_size('@', src_slice->typecode & TYPECODE_MASK, NULL)) {
diff --git a/py/objtuple.c b/py/objtuple.c
index 805ed955db..3de466b8c2 100644
--- a/py/objtuple.c
+++ b/py/objtuple.c
@@ -184,7 +184,7 @@ mp_obj_t mp_obj_tuple_subscr(mp_obj_t self_in, mp_obj_t index, mp_obj_t value) {
         // load
         mp_obj_tuple_t *self = MP_OBJ_TO_PTR(self_in);
         // when called with a native type (eg namedtuple) using mp_obj_tuple_subscr, get the native self
-        if (mp_type_subscr(self->base.type) != &mp_obj_tuple_subscr) {
+        if (mp_type_get_subscr_slot(self->base.type) != &mp_obj_tuple_subscr) {
             self = mp_obj_cast_to_native_base(self_in, &mp_type_tuple);
         }