diff --git a/lms/djangoapps/edxnotes/decorators.py b/lms/djangoapps/edxnotes/decorators.py
index 247bb6b913..7c12275aca 100644
--- a/lms/djangoapps/edxnotes/decorators.py
+++ b/lms/djangoapps/edxnotes/decorators.py
@@ -29,12 +29,12 @@ def edxnotes(cls):
         if not settings.FEATURES.get("ENABLE_EDXNOTES"):
             return original_get_html(self, *args, **kwargs)
 
-        runtime = getattr(self, 'descriptor', self).runtime
+        runtime = getattr(self, 'block', self).runtime
         if not hasattr(runtime, 'modulestore'):
             return original_get_html(self, *args, **kwargs)
 
         is_studio = getattr(self.runtime, "is_author_mode", False)
-        course = getattr(self, 'descriptor', self).runtime.modulestore.get_course(self.scope_ids.usage_id.context_key)
+        course = getattr(self, 'block', self).runtime.modulestore.get_course(self.scope_ids.usage_id.context_key)
 
         # Must be disabled when:
         # - in Studio
diff --git a/lms/djangoapps/edxnotes/helpers.py b/lms/djangoapps/edxnotes/helpers.py
index d8e743536d..17705f835e 100644
--- a/lms/djangoapps/edxnotes/helpers.py
+++ b/lms/djangoapps/edxnotes/helpers.py
@@ -323,7 +323,7 @@ def get_notes(request, course, page=DEFAULT_PAGE, page_size=DEFAULT_PAGE_SIZE, t
 
     Arguments:
         request: HTTP request object
-        course: Course descriptor
+        course: Course block
         page: requested or default page number
         page_size: requested or default page size
         text: text to search. If None then return all results for the current logged in user.
diff --git a/lms/djangoapps/edxnotes/tests.py b/lms/djangoapps/edxnotes/tests.py
index fe138810a0..3cd7bafa5b 100644
--- a/lms/djangoapps/edxnotes/tests.py
+++ b/lms/djangoapps/edxnotes/tests.py
@@ -83,8 +83,8 @@ class TestProblem:
         user = user or UserFactory()
         user_service = StubUserService(user)
         self.runtime = MagicMock(service=lambda _a, _b: user_service, is_author_mode=False)
-        self.descriptor = MagicMock()
-        self.descriptor.runtime.modulestore.get_course.return_value = course
+        self.block = MagicMock()
+        self.block.runtime.modulestore.get_course.return_value = course
 
     def get_html(self):
         """
@@ -171,7 +171,7 @@ class EdxNotesDecoratorTest(ModuleStoreTestCase):
         """
         Tests that get_html is not wrapped when problem is rendered by Blockstore runtime.
         """
-        del self.problem.descriptor.runtime.modulestore
+        del self.problem.block.runtime.modulestore
         assert 'original_get_html' == self.problem.get_html()
 
     def test_edxnotes_harvard_notes_enabled(self):
diff --git a/lms/djangoapps/edxnotes/views.py b/lms/djangoapps/edxnotes/views.py
index 04c50da08d..54b1fa65f4 100644
--- a/lms/djangoapps/edxnotes/views.py
+++ b/lms/djangoapps/edxnotes/views.py
@@ -71,7 +71,7 @@ def edxnotes(request, course_id):
     }
 
     if not has_notes:
-        field_data_cache = FieldDataCache.cache_for_descriptor_descendents(
+        field_data_cache = FieldDataCache.cache_for_block_descendents(
             course.id, request.user, course, depth=2
         )
         course_block = get_block_for_descriptor(