From 2f8af3b986adf603f19a5947c62ec4ab5f5b4931 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Sat, 14 Feb 2026 09:17:18 -0500
Subject: [PATCH 1/5] build!: Switch to openedx-core (renamed from
 openedx-learning)

Instead of installing openedx-learning==0.32.0, we install openedx-core==0.34.1.
We update various class names, function names, docstrings, and comments to
represent the rename:

* By default, we use the term "openedx-core" everywhere.
* We use "Open edX Core" occasionally to look nice external-facing documentation.
* In snake-case code, it's `*_openedx_core_*`.
* In camel-case code, it's `*OpenedXCore*`

For consistency's sake we avoid any variant of oex_core, OeXCore OexCore,
Open-edX-Core, OpenEdxCore, etc.
There should be no more occurances of learning_core, learning-core, Learning
Core, Learning-Core, openedx-learning, openedx_learning, etc.

BREAKING CHANGE: for openedx-learning/openedx-core developers:
You may need to uninstall openedx-learning and re-install openedx-core
from your venv. If running tutor, you may need to un-mount openedx-learning,
rename the directory to openedx-core, re-mount it, and re-build.
The code APIs themselves are fully backwards-compatible.

Part of: https://github.com/openedx/openedx-core/issues/470
---
 .../contentstore/views/component.py           |  2 +-
 .../contentstore/views/transcripts_ajax.py    | 14 ++---
 cms/djangoapps/modulestore_migrator/admin.py  |  2 +-
 .../modulestore_migrator/api/read_api.py      |  8 +--
 cms/djangoapps/modulestore_migrator/data.py   |  4 +-
 cms/djangoapps/modulestore_migrator/models.py |  2 +-
 .../modulestore_migrator/rest_api/v1/views.py |  4 +-
 cms/djangoapps/modulestore_migrator/tasks.py  | 10 ++--
 cms/envs/common.py                            |  2 +-
 cms/envs/test.py                              |  2 +-
 cms/lib/xblock/upstream_sync.py               |  2 +-
 common/djangoapps/track/contexts.py           |  2 +-
 common/templates/xblock_v2/xblock_iframe.html | 10 ++--
 docs/concepts/extension_points.rst            |  2 +-
 docs/decisions/0020-upstream-downstream.rst   |  2 +-
 lms/djangoapps/edxnotes/tests.py              |  4 +-
 lms/envs/common.py                            |  2 +-
 lms/urls.py                                   |  2 +-
 .../djangoapps/content/search/documents.py    |  4 +-
 .../content_libraries/api/blocks.py           | 14 ++---
 .../api/courseware_import.py                  |  4 +-
 .../content_libraries/api/libraries.py        |  6 +-
 .../core/djangoapps/content_libraries/apps.py |  2 +-
 .../0001-index-libraries-in-elasticsearch.rst |  6 +-
 .../content_libraries/library_context.py      |  2 +-
 .../commands/content_libraries_import.py      |  2 +-
 .../djangoapps/content_libraries/models.py    |  8 +--
 .../content_libraries/permissions.py          |  2 +-
 .../content_libraries/rest_api/blocks.py      |  4 +-
 .../content_libraries/rest_api/libraries.py   |  4 +-
 .../content_libraries/rest_api/serializers.py |  2 +-
 .../djangoapps/content_libraries/tasks.py     |  6 +-
 .../content_libraries/tests/base.py           |  4 +-
 .../tests/test_containers.py                  |  6 +-
 .../tests/test_content_libraries.py           | 12 ++--
 .../tests/test_course_to_library.py           |  2 +-
 .../tests/test_embed_block.py                 |  2 +-
 .../content_libraries/tests/test_events.py    |  4 +-
 .../content_libraries/tests/test_runtime.py   | 12 ++--
 .../tests/test_static_assets.py               |  8 +--
 .../content_libraries/tests/test_views_lti.py |  2 +-
 .../djangoapps/content_staging/README.rst     |  2 +-
 openedx/core/djangoapps/olx_rest_api/views.py |  8 +--
 .../core/djangoapps/video_config/services.py  |  4 +-
 .../video_config/transcripts_utils.py         | 14 ++---
 openedx/core/djangoapps/xblock/README.rst     |  2 +-
 openedx/core/djangoapps/xblock/api.py         | 16 +++---
 openedx/core/djangoapps/xblock/apps.py        |  6 +-
 ...ore_runtime.py => openedx_core_runtime.py} | 56 +++++++++----------
 .../core/djangoapps/xblock/runtime/runtime.py |  6 +-
 .../core/djangoapps/xblock/runtime/shims.py   |  2 +-
 openedx/core/lib/.coveragerc                  |  4 +-
 openedx/core/lib/xblock_serializer/api.py     |  6 +-
 .../lib/xblock_serializer/block_serializer.py |  2 +-
 .../core/lib/xblock_serializer/test_api.py    | 12 ++--
 openedx/core/lib/xblock_serializer/utils.py   |  9 +--
 requirements/constraints.txt                  |  2 +-
 requirements/edx/base.txt                     | 16 +++---
 requirements/edx/development.txt              | 16 +++---
 requirements/edx/doc.txt                      | 16 +++---
 requirements/edx/kernel.in                    |  2 +-
 requirements/edx/testing.txt                  | 16 +++---
 xmodule/README.rst                            | 11 ++--
 xmodule/html_block.py                         |  2 +-
 xmodule/library_content_block.py              |  2 +-
 xmodule/library_tools.py                      |  2 +-
 xmodule/raw_block.py                          |  2 +-
 xmodule/video_block/video_handlers.py         |  2 +-
 xmodule/xml_block.py                          |  2 +-
 69 files changed, 217 insertions(+), 217 deletions(-)
 rename openedx/core/djangoapps/xblock/runtime/{learning_core_runtime.py => openedx_core_runtime.py} (90%)

diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index fbd29a89d1b7..7fc4314c4ecd 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -614,7 +614,7 @@ def get_unit_tags(usage_key):
     Get the tags of a Unit and build a json to be read by the UI
 
     Note: When migrating the `TagList` subview from `container_subview.js` to the course-authoring MFE,
-    this function can be simplified to use the REST API of openedx-learning,
+    this function can be simplified to use the REST API of openedx-core,
     which already provides this grouping + sorting logic.
     """
     # Get content tags from content tagging API
diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py
index 3fa0cba95182..2a7c0d97f100 100644
--- a/cms/djangoapps/contentstore/views/transcripts_ajax.py
+++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py
@@ -91,18 +91,18 @@ def link_video_to_component(video_component, user):
     return edx_video_id
 
 
-def save_video_transcript_in_learning_core(
+def save_video_transcript_in_openedx_core(
     usage_key,
     input_format,
     transcript_content,
     language_code
 ):
     """
-    Saves a video transcript to the learning core.
+    Saves a video transcript with the openedx-core Content API.
 
-    Learning Core uses the standard `.srt` format for subtitles.
+    openedx-core uses the standard `.srt` format for subtitles.
     Note: SJSON is an edx-specific format that we're trying to move away from,
-    so for all new stuff related to Learning Core should only use `.srt`.
+    so for all new stuff related to openedx-core should only use `.srt`.
 
     Arguments:
         usage_key: UsageKey of the block
@@ -615,7 +615,7 @@ def choose_transcripts(request):
 
         # 3. Upload the retrieved transcript to DS for the linked video ID.
         if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-            success = save_video_transcript_in_learning_core(
+            success = save_video_transcript_in_openedx_core(
                 video.usage_key,
                 input_format,
                 transcript_content,
@@ -669,7 +669,7 @@ def rename_transcripts(request):
 
         # 3. Upload the retrieved transcript to DS for the linked video ID.
         if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-            success = save_video_transcript_in_learning_core(
+            success = save_video_transcript_in_openedx_core(
                 video.usage_key,
                 input_format,
                 transcript_content,
@@ -725,7 +725,7 @@ def replace_transcripts(request):
         for transcript in transcript_content:
             [language_code, json_content] = transcript
             if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-                success = save_video_transcript_in_learning_core(
+                success = save_video_transcript_in_openedx_core(
                     video.usage_key,
                     Transcript.SJSON,
                     json_content,
diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index c9a5c90256fd..4165c1ad6918 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -1,5 +1,5 @@
 """
-A nice little admin interface for migrating courses and libraries from modulstore to Learning Core.
+A nice little admin interface for migrating courses and libraries from modulstore to openedx-core.
 """
 import logging
 
diff --git a/cms/djangoapps/modulestore_migrator/api/read_api.py b/cms/djangoapps/modulestore_migrator/api/read_api.py
index e7d57c8bc4be..5249a905af66 100644
--- a/cms/djangoapps/modulestore_migrator/api/read_api.py
+++ b/cms/djangoapps/modulestore_migrator/api/read_api.py
@@ -47,7 +47,7 @@
 
 def get_forwarding_for_blocks(source_keys: t.Iterable[UsageKey]) -> dict[UsageKey, ModulestoreBlockMigrationSuccess]:
     """
-    Authoritatively determine how some Modulestore blocks have been migrated to Learning Core.
+    Authoritatively determine how some Modulestore blocks have been migrated to openedx-core.
 
     Returns a mapping from source usage keys to block migration data objects. Each block migration object
     holds the target usage key and title. If a source key is missing from the mapping, then it has not
@@ -79,7 +79,7 @@ def get_forwarding_for_blocks(source_keys: t.Iterable[UsageKey]) -> dict[UsageKe
 
 def is_forwarded(source_key: SourceContextKey) -> bool:
     """
-    Has this course or legacy library been authoratively migrated to Learning Core,
+    Has this course or legacy library been authoratively migrated to openedx-core,
     such that references to the source course/library should be forwarded to the target library?
     """
     return get_forwarding(source_key) is not None
@@ -87,7 +87,7 @@ def is_forwarded(source_key: SourceContextKey) -> bool:
 
 def get_forwarding(source_key: SourceContextKey) -> ModulestoreMigration | None:
     """
-    Authoritatively determine how some Modulestore course or legacy library has been migrated to Learning Core.
+    Authoritatively determine how some Modulestore course or legacy library has been migrated to openedx-core.
 
     If no such successful migration exists, returns None.
 
@@ -123,7 +123,7 @@ def get_migrations(
     is_failed: bool | None = None,
 ) -> t.Generator[ModulestoreMigration]:
     """
-    Given some criteria, get all modulestore->LearningCore migrations.
+    Given some criteria, get all modulestore->openedx-core migrations.
 
     Returns an iterable, ordered from NEWEST to OLDEST.
 
diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
index 529d4c78ad40..ea943ea8e6ec 100644
--- a/cms/djangoapps/modulestore_migrator/data.py
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -92,7 +92,7 @@ def default(cls) -> RepeatHandlingStrategy:
 @dataclass(frozen=True)
 class ModulestoreMigration:
     """
-    Metadata on a migration of a course or legacy library to a v2 library in learning core.
+    Metadata on a migration of a course or legacy library to a v2 library in openedx-core.
     """
     pk: int
     source_key: SourceContextKey
@@ -107,7 +107,7 @@ class ModulestoreMigration:
 @dataclass(frozen=True)
 class ModulestoreBlockMigrationResult:
     """
-    Base class for a modulestore block that was part of an attempted migration to learning core.
+    Base class for a modulestore block that was part of an attempted migration to openedx-core.
     """
     source_key: UsageKey
     is_failed: t.ClassVar[bool]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index 2dcc6224cace..bbf431faf3f3 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -68,7 +68,7 @@ def __str__(self):
 class ModulestoreMigration(models.Model):
     """
     Tracks the action of a user importing a Modulestore-based course or legacy library into a
-    learning-core based learning package
+    openedx-core based learning package
 
     Notes:
     * As of Ulmo, a learning package is always associated with a v2 content library, but we
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index fa46a2c57005..48cdb5013849 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -75,7 +75,7 @@
 )
 class MigrationViewSet(StatusViewSet):
     """
-    JSON HTTP API to create and check on ModuleStore-to-Learning-Core migration tasks.
+    JSON HTTP API to create and check on ModuleStore-to-openedx-core migration tasks.
     """
 
     authentication_classes = (
@@ -257,7 +257,7 @@ def create(self, request, *args, **kwargs):
 
 class BulkMigrationViewSet(StatusViewSet):
     """
-    JSON HTTP API to bulk-create ModuleStore-to-Learning-Core migration tasks.
+    JSON HTTP API to bulk-create ModuleStore-to-openedx-core migration tasks.
     """
 
     authentication_classes = (
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index 1ec72b558f86..f10b60a0f062 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -61,7 +61,7 @@
 
 class MigrationStep(Enum):
     """
-    Strings representation the state of an in-progress modulestore-to-learning-core import.
+    Strings representation the state of an in-progress modulestore-to-openedx-core import.
 
     We use these values to set UserTaskStatus.state.
     The other possible UserTaskStatus.state values are the built-in ones:
@@ -313,16 +313,16 @@ def _import_structure(
     status: UserTaskStatus,
 ) -> tuple[t.Any, _MigratedNode]:
     """
-    Import the staged content structure into the target Learning Core library.
+    Import the staged content structure into the target openedx-core library.
 
     Args:
         migration (ModulestoreMigration):
-            The migration record representing the ongoing modulestore-to-learning-core migration.
+            The migration record representing the ongoing modulestore-to-openedx-core migration.
         source_data (_MigrationSourceData):
             Data extracted from the legacy modulestore, including the source root usage key.
             Use `_validate_input()` to generate this data.
         target_library (libraries_api.ContentLibraryMetadata):
-            The target library where the new Learning Core content will be created.
+            The target library where the new openedx-core content will be created.
         content_by_filename (dict[str, int]):
             A mapping between OLX file names and their associated file IDs in the staging area.
             Use `_import_assets` to generate this content.
@@ -338,7 +338,7 @@ def _import_structure(
                   `content_api.bulk_draft_changes_for`, containing all the imported changes.
                 - The second element (`root_migrated_node`): a `_MigratedNode` object that
                   represents the mapping between the legacy root node and its newly created
-                  Learning Core equivalent.
+                  openedx-core equivalent.
     """
     migration = source_data.migration
     migration_context = _MigrationContext(
diff --git a/cms/envs/common.py b/cms/envs/common.py
index c2cf21c05699..0b465cb37cc9 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -712,7 +712,7 @@ def make_lms_template_path(settings):
     'cms.djangoapps.export_course_metadata.apps.ExportCourseMetadataConfig',
     'cms.djangoapps.modulestore_migrator',
 
-    # New (Learning-Core-based) XBlock runtime
+    # New (openedx-core-based) XBlock runtime
     'openedx.core.djangoapps.xblock.apps.StudioXBlockAppConfig',
 
     'openedx.core.djangoapps.util.apps.UtilConfig',
diff --git a/cms/envs/test.py b/cms/envs/test.py
index b25c22dc7e40..feee4f820f33 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -210,7 +210,7 @@
 
 RATELIMIT_RATE = '2/m'
 
-############## openedx-learning (Learning Core) config ##############
+############## Open edX Core (openedx-core) config ##############
 OPENEDX_LEARNING = {
     "MEDIA": {"BACKEND": "django.core.files.storage.InMemoryStorage", "OPTIONS": {"location": MEDIA_ROOT + "_private"}}
 }
diff --git a/cms/lib/xblock/upstream_sync.py b/cms/lib/xblock/upstream_sync.py
index fd3bb8a6733d..1ce2f917b039 100644
--- a/cms/lib/xblock/upstream_sync.py
+++ b/cms/lib/xblock/upstream_sync.py
@@ -3,7 +3,7 @@
 usages.
 
 At the time of writing, we assume that for any upstream-downstream linkage:
-* The upstream is a Component or Container from a Learning Core-backed Content
+* The upstream is a Component or Container from a openedx-core-backed Content
   Library.
 * The downstream is a block of compatible type in a SplitModuleStore-backed
   Course.
diff --git a/common/djangoapps/track/contexts.py b/common/djangoapps/track/contexts.py
index 0ac8292e258d..191f4856259d 100644
--- a/common/djangoapps/track/contexts.py
+++ b/common/djangoapps/track/contexts.py
@@ -48,7 +48,7 @@ def course_context_from_course_id(course_id):
     """
     Creates a course context from a `course_id`.
 
-    For newer parts of the system (i.e. Learning-Core-based libraries/courses/etc.)
+    For newer parts of the system (i.e. openedx-core-based libraries/courses/etc.)
     use context_dict_for_learning_context instead of this method.
 
     Example Returned Context::
diff --git a/common/templates/xblock_v2/xblock_iframe.html b/common/templates/xblock_v2/xblock_iframe.html
index 9bf0ab2df94f..95fba646c38b 100644
--- a/common/templates/xblock_v2/xblock_iframe.html
+++ b/common/templates/xblock_v2/xblock_iframe.html
@@ -286,7 +286,7 @@
                 // Does the XBlock HTML contain arguments to pass to the InitFunction?
                 let data = {};
                 [].forEach.call(element.children, (childNode) => {
-                    // The newer/pure/LearningCore runtime uses 'xblock_json_init_args'
+                    // The newer/pure/openedx-core runtime uses 'xblock_json_init_args'
                     // while the LMS runtime uses 'xblock-json-init-args'.
                     if (
                         childNode.matches('script.xblock_json_init_args')
@@ -405,13 +405,13 @@
               //
               // Here that is an issue because we show a confirmation modal when clicking cancel,
               // if the user stays to edit all TinyMCE editors are no longer there.
-              // 
+              //
               // We uncouple the listener to avoid remove the TinyMCE editors
               const extraCancelSelector = '.cancel-button';
               const elements = $(extraCancelSelector).first();
               if (elements.length) {
                 elements.first().unbind("click");
-                elements.on('click', function() {                    
+                elements.on('click', function() {
                     event.preventDefault();
                     runtime.notify('cancel', {});
                 });
@@ -421,7 +421,7 @@
 
         // Recursively initialize the JavaScript code of each XBlock:
         function initializeXBlockAndChildren(element, callback) {
-            // The newer/pure/LearningCore runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
+            // The newer/pure/openedx-core runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
             const usageId = element.getAttribute('data-usage') || element.getAttribute('data-usage-id');
             if (usageId !== null) {
                 element[USAGE_ID_KEY] = usageId;
@@ -461,7 +461,7 @@
         }
 
         // Find the root XBlock node.
-        // The newer/pure/LearningCore runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
+        // The newer/pure/openedx-core runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
         const rootNode = document.querySelector('.xblock, .xblock-v1'); // will always return the first matching element
         initializeXBlockAndChildren(rootNode, () => {
         });
diff --git a/docs/concepts/extension_points.rst b/docs/concepts/extension_points.rst
index ac70edc43209..969881873978 100644
--- a/docs/concepts/extension_points.rst
+++ b/docs/concepts/extension_points.rst
@@ -124,7 +124,7 @@ Here are the different integration points that python plugins can use:
      - By default, the registration page for each instance of Open edX has fields that ask for information such as a user’s name, country, and highest level of education completed. You can add custom fields to the registration page for your own Open edX instance. These fields can be different types, including text entry fields and drop-down lists. See `Adding Custom Fields to the Registration Page`_.
    * - Learning Context (``openedx.learning_context``)
      - Trial, Limited
-     - A "Learning Context" is a course, a library, a program, a blog, an external site, or some other collection of content where learning happens. If you are trying to build a totally new learning experience that's not a type of course, you may need to implement a new learning context. Learning contexts are a new abstraction and are only supported in the nascent Learning-Core-based XBlock runtime. Since existing courses use modulestore instead of Learning Core, they are not yet implemented as learning contexts. However, Learning-Core-based content libraries are. See |learning_context.py|_ to learn more.
+     - A "Learning Context" is a course, a library, a program, a blog, an external site, or some other collection of content where learning happens. If you are trying to build a totally new learning experience that's not a type of course, you may need to implement a new learning context. Learning contexts are a new abstraction and are only supported in the nascent openedx-core-based XBlock runtime. Since existing courses use modulestore instead of openedx-core, they are not yet implemented as learning contexts. However, openedx-core-based content libraries are. See |learning_context.py|_ to learn more.
    * - User partition scheme (``openedx.user_partition_scheme`` and ``openedx.dynamic_partition_generator``)
      - Unknown, Stable
      - A user partition scheme is a named way for dividing users in a course into groups, usually to show different content to different users or to run experiments. Partitions may be added to a course manually, or automatically added by a "dynamic partition generator." The core platform includes partition scheme plugins like ``random``, ``cohort``, and ``enrollment_track``. See the |UserPartition docstring|_ to learn more.
diff --git a/docs/decisions/0020-upstream-downstream.rst b/docs/decisions/0020-upstream-downstream.rst
index 2b35ec8c6b8f..47dbb2c88b41 100644
--- a/docs/decisions/0020-upstream-downstream.rst
+++ b/docs/decisions/0020-upstream-downstream.rst
@@ -13,7 +13,7 @@ Context
 
 We are replacing the existing Legacy ("V1") Content Libraries system, based on
 ModuleStore, with a Relaunched ("V2") Content Libraries  system, based on
-Learning Core. V1 and V2 libraries will coexist for at least one release to
+openedx-core. V1 and V2 libraries will coexist for at least one release to
 allow for migration; eventually, V1 libraries will be removed entirely.
 
 Content from V1 libraries can only be included into courses using the
diff --git a/lms/djangoapps/edxnotes/tests.py b/lms/djangoapps/edxnotes/tests.py
index acc6140d1a31..6c6ba4287a99 100644
--- a/lms/djangoapps/edxnotes/tests.py
+++ b/lms/djangoapps/edxnotes/tests.py
@@ -167,9 +167,9 @@ def test_edxnotes_studio(self):
         self.problem.runtime.is_author_mode = True
         assert 'original_get_html' == self.problem.get_html()
 
-    def test_edxnotes_learning_core_runtime(self):
+    def test_edxnotes_openedx_core_runtime(self):
         """
-        Tests that get_html is not wrapped when problem is rendered by the learning core runtime.
+        Tests that get_html is not wrapped when problem is rendered by the openedx-core runtime.
         """
         del self.problem.block.runtime.modulestore
         assert 'original_get_html' == self.problem.get_html()
diff --git a/lms/envs/common.py b/lms/envs/common.py
index fc866631890a..aeebf95d4cd8 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1780,7 +1780,7 @@
     # User tours
     'lms.djangoapps.user_tours',
 
-    # New (Learning-Core-based) XBlock runtime
+    # New XBlock runtime, based on openedx-core Content API
     'openedx.core.djangoapps.xblock.apps.LmsXBlockAppConfig',
 
     # Student support tools
diff --git a/lms/urls.py b/lms/urls.py
index ca6744305a54..3ada605bbd83 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -344,7 +344,7 @@
         name='xblock_resource_url',
     ),
 
-    # New (Learning-Core-based) XBlock REST API
+    # New XBlock REST API, based on the openedx-core Content API
     path('', include(('openedx.core.djangoapps.xblock.rest_api.urls', 'openedx.core.djangoapps.xblock'),
                      namespace='xblock_api')),
 
diff --git a/openedx/core/djangoapps/content/search/documents.py b/openedx/core/djangoapps/content/search/documents.py
index 1d131923f5a8..aabb6b82d918 100644
--- a/openedx/core/djangoapps/content/search/documents.py
+++ b/openedx/core/djangoapps/content/search/documents.py
@@ -137,7 +137,7 @@ def meili_id_from_opaque_key(key: OpaqueKey) -> str:
     hyphens (-) and underscores (_). Since our opaque keys don't meet this
     requirement, we transform them to a similar slug ID string that does.
 
-    In the future, with Learning Core's data models in place for courseware,
+    In the future, with openedx-core's data models in place for courseware,
     we could use PublishableEntity's primary key / UUID instead.
     """
     # The slugified key _may_ not be unique so we append a hashed string to make it unique:
@@ -232,7 +232,7 @@ class implementation returns only:
     if hasattr(block, "edited_on"):
         block_data[Fields.modified] = block.edited_on.timestamp()
     # Get the breadcrumbs (course, section, subsection, etc.):
-    if block.usage_key.context_key.is_course:  # Getting parent is not yet implemented in Learning Core (for libraries).
+    if block.usage_key.context_key.is_course:  # Getting parent is not yet implemented in openedx-core (for libraries).
         cur_block = block
         while cur_block.parent:
             if not cur_block.has_cached_parent:
diff --git a/openedx/core/djangoapps/content_libraries/api/blocks.py b/openedx/core/djangoapps/content_libraries/api/blocks.py
index 940d60e27630..6db7d5b0fb17 100644
--- a/openedx/core/djangoapps/content_libraries/api/blocks.py
+++ b/openedx/core/djangoapps/content_libraries/api/blocks.py
@@ -439,7 +439,7 @@ def _import_staged_block(
             # The ``data`` attribute is going to be None because the clipboard
             # is optimized to not do redundant file copying when copying/pasting
             # within the same course (where all the Files and Uploads are
-            # shared). Learning Core backed content Components will always store
+            # shared). openedx-core backed content Components will always store
             # a Component-local "copy" of the data, and rely on lower-level
             # deduplication to happen in the ``contents`` app.
             filename = staged_content_file_data.filename
@@ -459,14 +459,14 @@ def _import_staged_block(
             # Courses don't support having assets that are local to a specific
             # component, and instead store all their content together in a
             # shared Files and Uploads namespace. If we're pasting that into a
-            # Learning Core backed data model (v2 Libraries), then we want to
+            # openedx-core backed data model (v2 Libraries), then we want to
             # prepend "static/" to the filename. This will need to get updated
-            # when we start moving courses over to Learning Core, or if we start
+            # when we start moving courses over to openedx-core, or if we start
             # storing course component assets in sub-directories of Files and
             # Uploads.
             #
             # The reason we don't just search for a "static/" prefix is that
-            # Learning Core components can store other kinds of files if they
+            # openedx-core components can store other kinds of files if they
             # wish (though none currently do).
             source_assumes_global_assets = not isinstance(
                 source_context_key, LibraryLocatorV2
@@ -474,8 +474,8 @@ def _import_staged_block(
             if source_assumes_global_assets:
                 filename = f"static/{filename}"
 
-            # Now construct the Learning Core data models for it...
-            # TODO: more of this logic should be pushed down to openedx-learning
+            # Now construct the Core data models for it...
+            # TODO: more of this logic should be pushed down to openedx-core
             media_type_str, _encoding = mimetypes.guess_type(filename)
             if not media_type_str:
                 media_type_str = "application/octet-stream"
@@ -687,7 +687,7 @@ def get_or_create_olx_media_type(block_type: str) -> MediaType:
     """
     Get or create a MediaType for the block type.
 
-    Learning Core stores all Content with a Media Type (a.k.a. MIME type). For
+    openedx-core stores all Content with a Media Type (a.k.a. MIME type). For
     OLX, we use the "application/vnd.*" convention, per RFC 6838.
     """
     return content_api.get_or_create_media_type(
diff --git a/openedx/core/djangoapps/content_libraries/api/courseware_import.py b/openedx/core/djangoapps/content_libraries/api/courseware_import.py
index de20243070d2..777327de7f92 100644
--- a/openedx/core/djangoapps/content_libraries/api/courseware_import.py
+++ b/openedx/core/djangoapps/content_libraries/api/courseware_import.py
@@ -24,7 +24,7 @@
 from opaque_keys.edx.keys import UsageKey
 from edx_rest_api_client.client import OAuthAPIClient
 
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_learning_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
 from xmodule.modulestore.django import modulestore
 
 from .. import tasks
@@ -209,7 +209,7 @@ def get_block_data(self, block_key):
         Get block OLX by serializing it from modulestore directly.
         """
         block = self.modulestore.get_item(block_key)
-        data = serialize_modulestore_block_for_learning_core(block)
+        data = serialize_modulestore_block_for_openedx_core(block)
         return {'olx': data.olx_str,
                 'static_files': {s.name: s for s in data.static_files}}
 
diff --git a/openedx/core/djangoapps/content_libraries/api/libraries.py b/openedx/core/djangoapps/content_libraries/api/libraries.py
index 4cd2387b9df9..3e6a09b9192d 100644
--- a/openedx/core/djangoapps/content_libraries/api/libraries.py
+++ b/openedx/core/djangoapps/content_libraries/api/libraries.py
@@ -303,7 +303,7 @@ def get_libraries_for_user(user, org=None, text_search=None, order=None) -> Quer
 
 def get_metadata(queryset: QuerySet[ContentLibrary], text_search: str | None = None) -> list[ContentLibraryMetadata]:
     """
-    Take a list of ContentLibrary objects and return metadata from Learning Core.
+    Take a list of ContentLibrary objects and return metadata from openedx-core.
     """
     if text_search:
         queryset = queryset.filter(org__short_name__icontains=text_search)
@@ -322,7 +322,7 @@ def get_metadata(queryset: QuerySet[ContentLibrary], text_search: str | None = N
             allow_public_read=lib.allow_public_read,
 
             # These are currently dummy values to maintain the REST API contract
-            # while we shift to Learning Core models.
+            # while we shift to openedx-core models.
             num_blocks=0,
             last_published=None,
             has_unpublished_changes=False,
@@ -374,7 +374,7 @@ def get_library(library_key: LibraryLocatorV2) -> ContentLibraryMetadata:
 
     # TODO: I'm doing this one to match already-existing behavior, but this is
     # something that we should remove. It exists to accomodate some complexities
-    # with how Blockstore staged changes, but Learning Core works differently,
+    # with how Blockstore staged changes, but openedx-core works differently,
     # and has_unpublished_changes should be sufficient.
     # Ref: https://github.com/openedx/edx-platform/issues/34283
     has_unpublished_deletes = (
diff --git a/openedx/core/djangoapps/content_libraries/apps.py b/openedx/core/djangoapps/content_libraries/apps.py
index 52c3e5179721..abd9a7ec2bfe 100644
--- a/openedx/core/djangoapps/content_libraries/apps.py
+++ b/openedx/core/djangoapps/content_libraries/apps.py
@@ -16,7 +16,7 @@ class ContentLibrariesConfig(AppConfig):
     """
 
     name = 'openedx.core.djangoapps.content_libraries'
-    verbose_name = 'Content Libraries (Learning-Core-based)'
+    verbose_name = 'Content Libraries'
     # This is designed as a plugin for now so that
     # the whole thing is self-contained and can easily be enabled/disabled
     plugin_app = {
diff --git a/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst b/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
index c1779094024a..a0fa5e6eaeee 100644
--- a/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
+++ b/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
@@ -11,14 +11,14 @@ In Dec 2023, we decided to remove the code supporting this decision, because:
 * The index is disabled on edx.org, which will initially be the only user
   of Content Libraries V2.
 * As we migrate libraries from Modulestore to Blockstore and then from
-  Blockstore to Learning Core, the unused indexing code increases complexity
+  Blockstore to openedx-core, the unused indexing code increases complexity
   and decreases certainty.
 * With the decision to migrate from Blockstore-the-service to an in-process
-  storage backend (that is: Blockstore-the-app or Learning Core), it seems
+  storage backend (that is: Blockstore-the-app or openedx-core), it seems
   that we will be able to simply use Django ORM in order to filter/sort/search
   Content Library V2 metadata for the library listing page.
 * Searching Content Library V2 *block* content would still require indexing,
-  but we would rather implement that in Learning Core than use the current
+  but we would rather implement that in openedx-core than use the current
   implementation in the content_libraries app, which is untested, library-
   specific, and doesn't take into account library versioning. It always uses
   the latest draft, which is good for Library Authoring purposes, but not good for
diff --git a/openedx/core/djangoapps/content_libraries/library_context.py b/openedx/core/djangoapps/content_libraries/library_context.py
index 65c5508b22a2..39265115ce71 100644
--- a/openedx/core/djangoapps/content_libraries/library_context.py
+++ b/openedx/core/djangoapps/content_libraries/library_context.py
@@ -24,7 +24,7 @@ class LibraryContextImpl(LearningContext):
     """
     Implements content libraries as a learning context.
 
-    This is the *new* content libraries based on Learning Core, not the old content
+    This is the *new* content libraries based on openedx-core, not the old content
     libraries based on modulestore.
     """
 
diff --git a/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py b/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
index cd68112d2b67..f27efb159f63 100644
--- a/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
+++ b/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
@@ -89,7 +89,7 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         """
         Collect all blocks from a course that are "importable" and write them to the
-        a learning core library.
+        a openedx-core library.
         """
 
         # Search for the library.
diff --git a/openedx/core/djangoapps/content_libraries/models.py b/openedx/core/djangoapps/content_libraries/models.py
index 4a292bae5d10..7798902b5c50 100644
--- a/openedx/core/djangoapps/content_libraries/models.py
+++ b/openedx/core/djangoapps/content_libraries/models.py
@@ -8,7 +8,7 @@
 LTI 1.3 Models
 ==============
 
-Content Libraries serves learning-core-based content through LTI 1.3 launches.
+Content Libraries serves openedx-core-based through LTI 1.3 launches.
 The interface supports resource link launches and grading services.  Two use
 cases justify the current data model to support LTI launches.  They are:
 
@@ -27,7 +27,7 @@
 The data model above is similar to the one provided by the current LTI 1.1
 implementation for modulestore and courseware content.  But, Content Libraries
 is orthogonal.  Its use-case is to offer standalone, embedded content from a
-specific backend (learning core).  As such, it decouples from LTI 1.1. and the
+specific backend (openedx-core).  As such, it decouples from LTI 1.1. and the
 logic assume no relationship or impact across the two applications.  The same
 reasoning applies to steps beyond the data model, such as at the XBlock
 runtime, authentication, and score handling, etc.
@@ -85,9 +85,9 @@ class ContentLibrary(models.Model):
     """
     A Content Library is a collection of content (XBlocks and/or static assets)
 
-    All actual content is stored in Learning Core, and any data that we'd want to
+    All actual content is stored in openedx-core, and any data that we'd want to
     transfer to another instance if this library were exported and then
-    re-imported on another Open edX instance should be kept in Learning Core. This
+    re-imported on another Open edX instance should be kept in openedx-core. This
     model in Studio should only be used to track settings specific to this Open
     edX instance, like who has permission to edit this content library.
 
diff --git a/openedx/core/djangoapps/content_libraries/permissions.py b/openedx/core/djangoapps/content_libraries/permissions.py
index c3a8b68c947c..1009ec363a08 100644
--- a/openedx/core/djangoapps/content_libraries/permissions.py
+++ b/openedx/core/djangoapps/content_libraries/permissions.py
@@ -1,5 +1,5 @@
 """
-Permissions for Content Libraries (v2, Learning-Core-based)
+Permissions for Content Libraries (v2, openedx-core-based)
 """
 from bridgekeeper import perms, rules
 from bridgekeeper.rules import Attribute, ManyRelation, Relation, blanket_rule, in_current_groups, Rule
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/blocks.py b/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
index 42c5b9341882..fffe5f7c31fd 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
@@ -194,7 +194,7 @@ def put(self, request, usage_key_str, file_path):
         file_wrapper = request.data['content']
         if file_wrapper.size > 20 * 1024 * 1024:  # > 20 MiB
             # TODO: This check was written when V2 Libraries were backed by the Blockstore micro-service.
-            #       Now that we're on Learning Core, do we still need it? Here's the original comment:
+            #       Now that we're on openedx-core, do we still need it? Here's the original comment:
             #         In the future, we need a way to use file_wrapper.chunks() to read
             #         the file in chunks and stream that to Blockstore, but Blockstore
             #         currently lacks an API for streaming file uploads.
@@ -406,7 +406,7 @@ def get_component_version_asset(request, component_version_uuid, asset_path):
     )
 
     # We already have logic for getting the correct content and generating the
-    # proper headers in Learning Core, but the response generated here is an
+    # proper headers in openedx-core, but the response generated here is an
     # X-Accel-Redirect and lacks the actual content. We eventually want to use
     # this response in conjunction with a media reverse proxy (Caddy or Nginx),
     # but in the short term we're just going to remove the redirect and stream
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/libraries.py b/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
index 2d50fa6c8644..d832d6e93291 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
@@ -3,7 +3,7 @@
 Content Libraries Views
 =======================
 
-This module contains the REST APIs for Learning Core-based content libraries,
+This module contains the REST APIs for openedx-core-based content libraries,
 and LTI 1.3 views (though I'm not sure how functional the LTI piece of this is
 right now).
 
@@ -59,7 +59,7 @@
 
     Historical note: These views used to be wrapped with @atomic because we
     wanted to make all views that operated on Blockstore (the predecessor
-    to Learning Core) atomic:
+    to openedx-core) atomic:
         https://github.com/openedx/edx-platform/pull/30456
 """
 import itertools
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/serializers.py b/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
index 9d68d6b27690..3fb8b3dbb7d2 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
@@ -198,7 +198,7 @@ class LibraryXBlockCreationSerializer(serializers.Serializer):
 
     block_type = serializers.CharField()
 
-    # TODO: Rename to ``block_id`` or ``slug``. The Learning Core XBlock runtime
+    # TODO: Rename to ``block_id`` or ``slug``. The openedx-core XBlock runtime
     # doesn't use definition_ids, but this field is really just about requesting
     # a specific block_id, e.g. the "best_tropical_vacation_spots" portion of a
     # problem with UsageKey:
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index 345733290057..f1b872abac9d 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -4,11 +4,11 @@
 Architecture note:
 
     Several functions in this file manage the copying/updating of blocks in modulestore
-    and learning core. These operations should only be performed within the context of CMS.
+    and openedx-core. These operations should only be performed within the context of CMS.
     However, due to existing edx-platform code structure, we've had to define the functions
     in shared source tree (openedx/) and the tasks are registered in both LMS and CMS.
 
-    To ensure that we're not accidentally importing things from learning core in the LMS context,
+    To ensure that we're not accidentally importing things from openedx-core in the LMS context,
     we use ensure_cms throughout this module.
 
     A longer-term solution to this issue would be to move the content_libraries app to cms:
@@ -183,7 +183,7 @@ def send_events_after_revert(draft_change_log_id: int, library_key_str: str) ->
     try:
         draft_change_log = DraftChangeLog.objects.get(id=draft_change_log_id)
     except DraftChangeLog.DoesNotExist:
-        # When a revert operation is a no-op, Learning Core deletes the empty
+        # When a revert operation is a no-op, openedx-core deletes the empty
         # DraftChangeLog, so we'll assume that's what happened here.
         log.info(f"Library revert in {library_key_str} did not result in any changes.")
         return
diff --git a/openedx/core/djangoapps/content_libraries/tests/base.py b/openedx/core/djangoapps/content_libraries/tests/base.py
index 9ccd33f942c2..859cb39ecf79 100644
--- a/openedx/core/djangoapps/content_libraries/tests/base.py
+++ b/openedx/core/djangoapps/content_libraries/tests/base.py
@@ -1,5 +1,5 @@
 """
-Tests for Learning-Core-based Content Libraries
+Tests for openedx-core-based Content Libraries
 """
 from contextlib import contextmanager
 import json
@@ -67,7 +67,7 @@
 @skip_unless_cms  # Content Libraries REST API is only available in Studio
 class ContentLibrariesRestApiTest(APITransactionTestCase):
     """
-    Base class for Learning-Core-based Content Libraries test that use the REST API
+    Base class for openedx-core-based Content Libraries test that use the REST API
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_containers.py b/openedx/core/djangoapps/content_libraries/tests/test_containers.py
index 7e6eac3beda8..15db5583c60d 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_containers.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_containers.py
@@ -1,5 +1,5 @@
 """
-Tests for Learning-Core-based Content Libraries
+Tests for openedx-core-based Content Libraries
 """
 from datetime import datetime, timezone
 import textwrap
@@ -875,7 +875,7 @@ def test_publish_subsection(self) -> None:
         )
 
         # TODO -- remove this when containers publish their children:
-        # https://github.com/openedx/openedx-learning/pull/307
+        # https://github.com/openedx/openedx-core/pull/307
         # Removing the unit with components because the components (children of children) are not published.
         # If the unit is kept, the subsection continues to have changes even after it is published.
         self._remove_container_children(
@@ -951,7 +951,7 @@ def test_publish_section(self) -> None:
         )
 
         # TODO -- remove this when containers publish their children:
-        # https://github.com/openedx/openedx-learning/pull/307
+        # https://github.com/openedx/openedx-core/pull/307
         # Removing the subsection with units because the units (children of children) are not published.
         # If the subsection is kept, the section continues to have changes even after it is published.
         self._remove_container_children(
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 24609f9389a0..8fafc9fe9202 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -1,5 +1,5 @@
 """
-Tests for Learning-Core-based Content Libraries
+Tests for openedx-core-based Content Libraries
 """
 from datetime import datetime, timezone
 import os
@@ -51,7 +51,7 @@
 @ddt.ddt
 class ContentLibrariesTestCase(ContentLibrariesRestApiTest):
     """
-    General tests for Learning-Core-based Content Libraries
+    General tests for openedx-core-based Content Libraries
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
@@ -357,7 +357,7 @@ def test_library_blocks(self):  # pylint: disable=too-many-statements
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem with unicode 🔥. It has "maximum attempts" set to **5**.</p>
-                <label>Learning Core is designed to store.</label>
+                <label>openedx-core is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -382,7 +382,7 @@ def test_library_blocks(self):  # pylint: disable=too-many-statements
         # Now view the XBlock's student_view (including draft changes):
         fragment = self._render_block_view(block_id, "student_view")
         assert 'resources' in fragment
-        assert 'Learning Core is designed to store.' in fragment['content']
+        assert 'openedx-core is designed to store.' in fragment['content']
 
         # Also call a handler to make sure that's working:
         handler_url = self._get_block_handler_url(block_id, "xmodule_handler") + "problem_get"
@@ -576,7 +576,7 @@ def test_library_permissions(self):  # pylint: disable=too-many-statements
 
         TODO: The asset permissions part of this test have been commented out
         for now. These should be re-enabled after we re-implement them over
-        Learning Core data models.
+        openedx-core data models.
         """
         # Create a few users to use for all of these tests:
         admin = UserFactory.create(username="Admin", email="admin@example.com", is_staff=True)
@@ -1678,7 +1678,7 @@ def test_authz_scope_with_combined_authz_and_legacy_permissions(self):
 
 @ddt.ddt
 class ContentLibraryXBlockValidationTest(APITestCase):
-    """Tests only focused on service validation, no Learning Core interactions here."""
+    """Tests only focused on service validation, no openedx-core interactions here."""
 
     @ddt.data(
         (URL_BLOCK_METADATA_URL, dict(block_key='totally_invalid_key')),
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py b/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
index 5b77791e9377..5f69a315efcb 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
@@ -1,5 +1,5 @@
 """
-Tests for Imports from Courses to Learning-Core-based Content Libraries
+Tests for Imports from Courses to openedx-core-based Content Libraries
 """
 import ddt
 from opaque_keys.edx.locator import LibraryContainerLocator
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
index 41abeed82986..93682a01f3c9 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
@@ -24,7 +24,7 @@
 class LibrariesEmbedViewTestCase(ContentLibrariesRestApiTest):
     """
     Tests for embed_view and interacting with draft/published/past versions of
-    Learning-Core-based XBlocks (in Content Libraries).
+    openedx-core-based XBlocks (in Content Libraries).
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_events.py b/openedx/core/djangoapps/content_libraries/tests/test_events.py
index 975cfbafb4d9..d0b91dc24860 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_events.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_events.py
@@ -1,5 +1,5 @@
 """
-Tests for Learning-Core-based Content Libraries
+Tests for openedx-core-based Content Libraries
 """
 from opaque_keys.edx.locator import (
     LibraryCollectionLocator,
@@ -35,7 +35,7 @@
 @skip_unless_cms
 class ContentLibrariesEventsTestCase(ContentLibrariesRestApiTest):
     """
-    Event tests for Learning-Core-based Content Libraries
+    Event tests for openedx-core-based Content Libraries
 
     These tests use the REST API, which in turn relies on the Python API.
     """
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index 97699dbf8d6b..0066e7698b94 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -1,5 +1,5 @@
 """
-Test the Learning-Core-based XBlock runtime and content libraries together.
+Test the openedx-core-based XBlock runtime and content libraries together.
 """
 import json
 
@@ -64,7 +64,7 @@ def setUp(self):
 @skip_unless_cms
 class ContentLibraryOlxTests(ContentLibraryContentTestMixin, TestCase):
     """
-    Basic test of the Learning-Core-based XBlock serialization-deserialization, using XBlocks in a content library.
+    Basic test of the openedx-core-based XBlock serialization-deserialization, using XBlocks in a content library.
     """
 
     def test_html_round_trip(self):
@@ -149,7 +149,7 @@ def test_html_round_trip(self):
 
 class ContentLibraryRuntimeTests(ContentLibraryContentTestMixin, TestCase):
     """
-    Basic tests of the Learning-Core-based XBlock runtime using XBlocks in a
+    Basic tests of the openedx-core-based XBlock runtime using XBlocks in a
     content library.
     """
     def test_dndv2_sets_translator(self):
@@ -180,7 +180,7 @@ def test_xblock_metadata(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>Learning Core is designed to store.</label>
+                <label>openedx-core is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -471,7 +471,7 @@ def test_scores_persisted(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>Learning Core is designed to store.</label>
+                <label>openedx-core is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -543,7 +543,7 @@ def test_i18n(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>Learning Core is designed to store.</label>
+                <label>openedx-core is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
index 91d9556b01f1..3036a0ae174f 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
@@ -1,5 +1,5 @@
 """
-Tests for static asset files in Learning-Core-based Content Libraries
+Tests for static asset files in openedx-core-based Content Libraries
 """
 from uuid import UUID
 
@@ -31,7 +31,7 @@
 @skip_unless_cms
 class ContentLibrariesStaticAssetsTest(ContentLibrariesRestApiTest):
     """
-    Tests for static asset files in Learning-Core-based Content Libraries
+    Tests for static asset files in openedx-core-based Content Libraries
     """
 
     def test_asset_filenames(self):
@@ -72,7 +72,7 @@ def test_asset_filenames(self):
 
     def test_video_transcripts(self):
         """
-        Test that video blocks can read transcript files out of learning core.
+        Test that video blocks can read transcript files out of openedx-core.
         """
         library = self._create_library(slug="transcript-test-lib", title="Transcripts Test Library")
         block = self._add_block_to_library(library["id"], "video", "video1")
@@ -111,7 +111,7 @@ def check_download():
         check_sjson()
         check_download()
         # Publish the OLX and the transcript file, since published data gets
-        # served differently by Learning Core and we should test that too.
+        # served differently by openedx-core and we should test that too.
         self._commit_library_changes(library["id"])
         check_sjson()
         check_download()
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
index b1ee61ca50f9..e7695a7c293a 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
@@ -85,5 +85,5 @@ class LibraryBlockLtiUrlViewTest(
     ContentLibrariesRestApiTest,
 ):
     """
-    Test generating LTI URL for a block in a library, using the installed Learning Core app.
+    Test generating LTI URL for a block in a library, using the installed openedx-core app.
     """
diff --git a/openedx/core/djangoapps/content_staging/README.rst b/openedx/core/djangoapps/content_staging/README.rst
index 71c43c4bffab..ab605c4d70ae 100644
--- a/openedx/core/djangoapps/content_staging/README.rst
+++ b/openedx/core/djangoapps/content_staging/README.rst
@@ -17,7 +17,7 @@ As this app is designed only for ephemeral use cases, API consumers should not
 expect that staged content will be stored for longer than 24 hours.
 
 This app is part of the CMS and is not intended to work with the LMS. It may be
-moved from the CMS into the future Learning Core project.
+moved from the CMS into the future openedx-core project.
 
 ---------------
 Clipboard Usage
diff --git a/openedx/core/djangoapps/olx_rest_api/views.py b/openedx/core/djangoapps/olx_rest_api/views.py
index 1083ee06f68d..b326cbd9109a 100644
--- a/openedx/core/djangoapps/olx_rest_api/views.py
+++ b/openedx/core/djangoapps/olx_rest_api/views.py
@@ -13,7 +13,7 @@
 from openedx.core.lib.api.view_utils import view_auth_classes
 from xmodule.modulestore.django import modulestore
 
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_learning_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
 
 
 @api_view(['GET'])
@@ -22,7 +22,7 @@ def get_block_olx(request, usage_key_str):
     """
     Given a modulestore XBlock usage ID (block-v1:...), get its OLX and a list
     of any static asset files it uses.
-    (There are other APIs for getting the OLX of Learning Core XBlocks.)
+    (There are other APIs for getting the OLX of openedx-core XBlocks.)
     """
     # Parse the usage key:
     try:
@@ -48,7 +48,7 @@ def serialize_block(block_key):
             return
 
         block = modulestore().get_item(block_key)
-        serialized_blocks[block_key] = serialize_modulestore_block_for_learning_core(block)
+        serialized_blocks[block_key] = serialize_modulestore_block_for_openedx_core(block)
 
         if block.has_children:
             for child_id in block.children:
@@ -103,7 +103,7 @@ def get_block_exportfs_file(request, usage_key_str, path):
         raise PermissionDenied("You must be a member of the course team in Studio to export OLX using this API.")
 
     block = modulestore().get_item(usage_key)
-    serialized = serialize_modulestore_block_for_learning_core(block)
+    serialized = serialize_modulestore_block_for_openedx_core(block)
     static_file = None
     for f in serialized.static_files:
         if f.name == path:
diff --git a/openedx/core/djangoapps/video_config/services.py b/openedx/core/djangoapps/video_config/services.py
index 5f2ca454eaa6..996d4ef93b56 100644
--- a/openedx/core/djangoapps/video_config/services.py
+++ b/openedx/core/djangoapps/video_config/services.py
@@ -231,7 +231,7 @@ def upload_transcript(
         is_library = isinstance(video_block.usage_key.context_key, LibraryLocatorV2)
         content: bytes = transcript_file.read()
         if is_library:
-            # Save transcript as static asset in Learning Core if is a library component
+            # Save transcript as static asset in openedx-core if is a library component
             filename = f'static/transcript-{new_language_code}.srt'
             add_library_block_static_asset_file(video_block.usage_key, filename, content)
         else:
@@ -355,7 +355,7 @@ def handle_editor_saved(
 
 def _save_transcript_field(video_block):
     """
-    Hacky workaround to ensure that transcript field is saved for Learning Core video blocks.
+    Hacky workaround to ensure that transcript field is saved for openedx-core video blocks.
 
     It's not clear why this is necessary.
     """
diff --git a/openedx/core/djangoapps/video_config/transcripts_utils.py b/openedx/core/djangoapps/video_config/transcripts_utils.py
index 7714680a3192..762b65b138eb 100644
--- a/openedx/core/djangoapps/video_config/transcripts_utils.py
+++ b/openedx/core/djangoapps/video_config/transcripts_utils.py
@@ -850,7 +850,7 @@ def get_transcript_for_video(video_location, subs_id, file_name, language):
     """
     Get video transcript from content store. This is a lower level function and is used by
     `get_transcript_from_contentstore`. Prefer that function instead where possible. If you
-    need to support getting transcripts from VAL or Learning Core as well, use the `get_transcript`
+    need to support getting transcripts from VAL or openedx-core as well, use the `get_transcript`
     function instead.
 
     NOTE: Transcripts can be searched from content store by two ways:
@@ -945,13 +945,13 @@ def build_components_import_path(usage_key, file_path):
     return f"components/{usage_key.block_type}/{usage_key.block_id}/{file_path}"
 
 
-def get_transcript_from_learning_core(video_block, language, output_format, transcripts_info):
+def get_transcript_from_openedx_core(video_block, language, output_format, transcripts_info):
     """
-    Get video transcript from Learning Core (used for Content Libraries)
+    Get video transcript from the openedx-core Content API.
 
     Limitation: This is only going to grab from the Draft version.
 
-    Learning Core models a VideoBlock's data in a more generic thing it calls a
+    openedx-core models a VideoBlock's data in a more generic thing it calls a
     Component. Each Component has its own virtual space for file-like data. The
     OLX for the VideoBlock itself is stored at the root of that space, as
     ``block.xml``. Static assets that are meant to be user-downloadable are
@@ -1015,7 +1015,7 @@ def get_transcript_from_learning_core(video_block, language, output_format, tran
             f"transcript files, but we tried to look up {file_path} for {usage_key}"
         )
 
-    # TODO: There should be a Learning Core API call for this:
+    # TODO: There should be a openedx-core API call for this:
     try:
         content = (
             component_version
@@ -1074,8 +1074,8 @@ def get_transcript(video, lang=None, output_format=Transcript.SRT, youtube_id=No
         lang = video.get_default_transcript_language(transcripts_info)
 
     if isinstance(video.scope_ids.usage_id, UsageKeyV2):
-        # This block is in Learning Core.
-        return get_transcript_from_learning_core(video, lang, output_format, transcripts_info)
+        # This block is in openedx-core.
+        return get_transcript_from_openedx_core(video, lang, output_format, transcripts_info)
 
     try:
         edx_video_id = clean_video_id(video.edx_video_id)
diff --git a/openedx/core/djangoapps/xblock/README.rst b/openedx/core/djangoapps/xblock/README.rst
index 245af2259932..0ff9f612714e 100644
--- a/openedx/core/djangoapps/xblock/README.rst
+++ b/openedx/core/djangoapps/xblock/README.rst
@@ -1,5 +1,5 @@
 This README was written back when the new runtime was backed by Blockstore.
-Now that the runtime is backed by Learning Core, this README is out of date.
+Now that the runtime is backed by openedx-core, this README is out of date.
 We need to audit and update it as part of
 `this task <https://github.com/openedx/edx-platform/issues/34283>`_.
 
diff --git a/openedx/core/djangoapps/xblock/api.py b/openedx/core/djangoapps/xblock/api.py
index f7ada820a97a..66b553ed15c8 100644
--- a/openedx/core/djangoapps/xblock/api.py
+++ b/openedx/core/djangoapps/xblock/api.py
@@ -28,9 +28,9 @@
 from openedx.core.types import User as UserType
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
-from openedx.core.djangoapps.xblock.runtime.learning_core_runtime import (
-    LearningCoreFieldData,
-    LearningCoreXBlockRuntime,
+from openedx.core.djangoapps.xblock.runtime.openedx_core_runtime import (
+    OpenedXCoreFieldData,
+    OpenedXCoreRuntime,
 )
 from .data import CheckPerm, LatestVersion
 from .rest_api.url_converters import VersionConverter
@@ -40,7 +40,7 @@
     get_auto_latest_version,
 )
 
-from .runtime.learning_core_runtime import LearningCoreXBlockRuntime
+from .runtime.openedx_core_runtime import OpenedXCoreRuntime
 
 # Made available as part of this package's public API:
 from openedx.core.djangoapps.xblock.learning_context import LearningContext
@@ -50,7 +50,7 @@
 log = logging.getLogger(__name__)
 
 
-def get_runtime(user: UserType | None) -> LearningCoreXBlockRuntime:
+def get_runtime(user: UserType | None) -> OpenedXCoreRuntime:
     """
     Return a new XBlockRuntime.
 
@@ -62,9 +62,9 @@ def get_runtime(user: UserType | None) -> LearningCoreXBlockRuntime:
     params = get_xblock_app_config().get_runtime_params()
     params.update(
         handler_url=get_handler_url,
-        authored_data_store=LearningCoreFieldData(),
+        authored_data_store=OpenedXCoreFieldData(),
     )
-    runtime = LearningCoreXBlockRuntime(user, **params)
+    runtime = OpenedXCoreRuntime(user, **params)
 
     return runtime
 
@@ -219,7 +219,7 @@ def get_block_olx(
     version: int | LatestVersion = LatestVersion.AUTO
 ) -> str:
     """
-    Get the OLX source of the of the given Learning-Core-backed XBlock and a version.
+    Get the OLX source of the of the given openedx-core-backed XBlock and a version.
     """
     component = get_component_from_usage_key(usage_key)
     version = get_auto_latest_version(version)
diff --git a/openedx/core/djangoapps/xblock/apps.py b/openedx/core/djangoapps/xblock/apps.py
index e4f07666c35e..ab2008e3c9c0 100644
--- a/openedx/core/djangoapps/xblock/apps.py
+++ b/openedx/core/djangoapps/xblock/apps.py
@@ -18,7 +18,7 @@ class XBlockAppConfig(AppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
         editing XBlock content.
         """
         raise NotImplementedError
@@ -45,7 +45,7 @@ class LmsXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
         editing XBlock content in the LMS
         """
         return dict(
@@ -68,7 +68,7 @@ class StudioXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the LearningCoreXBlockRuntime parameters appropriate for viewing and/or
+        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
         editing XBlock content in Studio
         """
         return dict(
diff --git a/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py b/openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py
similarity index 90%
rename from openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py
rename to openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py
index 2e24fc7ba1ab..85187090ba11 100644
--- a/openedx/core/djangoapps/xblock/runtime/learning_core_runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py
@@ -1,5 +1,5 @@
 """
-Learning Core XBlock Runtime code
+openedx-core XBlock Runtime code
 """
 from __future__ import annotations
 
@@ -22,7 +22,7 @@
 from xblock.field_data import FieldData
 
 from openedx.core.djangoapps.xblock.api import get_xblock_app_config
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_learning_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
 from openedx.core.lib.xblock_serializer.data import StaticFile
 from ..data import AuthoredDataMode, LatestVersion
 from ..utils import get_auto_latest_version
@@ -33,30 +33,30 @@
 log = logging.getLogger(__name__)
 
 
-class LearningCoreFieldData(FieldData):
+class OpenedXCoreFieldData(FieldData):
     """
-    FieldData for the Learning Core XBlock Runtime
+    FieldData for the openedx-core XBlock Runtime
 
-    LearningCoreFieldData only supports the ``content`` and ``settings`` scopes.
+    OpenedXCoreFieldData only supports the ``content`` and ``settings`` scopes.
     Any attempt to read or write fields with other scopes will raise a
     ``NotImplementedError``. This class does NOT support the parent and children
     scopes.
 
-    LearningCoreFieldData should only live for the duration of one request. The
-    interaction between LearningCoreXBlockRuntime and LearningCoreFieldData is
+    OpenedXCoreFieldData should only live for the duration of one request. The
+    interaction between OpenedXCoreRuntime and OpenedXCoreFieldData is
     as follows:
 
-    1. LearningCoreXBlockRuntime knows how retrieve authored content data from
-       the Learning Core APIs in openedx-learning. This content is stored as
-       OLX, and LearningCoreXBlockRuntime won't know how to parse it into
+    1. OpenedXCoreRuntime knows how retrieve authored content data from
+       the Content API in openedx-core. This content is stored as
+       OLX, and OpenedXCoreRuntime won't know how to parse it into
        fields, since serialization logic can happen in the XBlock itself.
-    2. LearningCoreXBlockRuntime will then invoke the block to parse the OLX and
-       then force_save its field data into LearningCoreFieldData.
+    2. OpenedXCoreRuntime will then invoke the block to parse the OLX and
+       then force_save its field data into OpenedXCoreFieldData.
     3. After this point, various handler and API calls might alter fields for
        a given block using the XBlock.
-    4. The main thing that LearningCoreXBlockRuntime will want to know later on
+    4. The main thing that OpenedXCoreRuntime will want to know later on
        is whether it needs to write any changes when its save_block method is
-       invoked. To support this, LearningCoreFieldData needs to track which
+       invoked. To support this, OpenedXCoreFieldData needs to track which
        blocks have changes to any of their fields. See the marked_unchanged
        method docstring for more details.
     """
@@ -74,9 +74,9 @@ def mark_unchanged(self, block):
         Calling set or delete on a field always marks the block with that field
         as changed, by adding its usage key to self.changed. But set() is also
         called at the very beginning, when a block is first loaded from the
-        database by the LearningCoreXBlockRuntime's get_block call.
+        database by the OpenedXCoreRuntime's get_block call.
 
-        This method exists so that LearningCoreXBlockRuntime can call it
+        This method exists so that OpenedXCoreRuntime can call it
         whenever it has either just done a get_block operation (because those
         set() calls represent the already-persisted content state), or a
         save_block operation (since those changes will have been persisted).
@@ -153,14 +153,14 @@ def _check_field(self, block, name):
         if field.scope not in (Scope.content, Scope.settings):
             raise NotImplementedError(
                 f"Scope {field.scope} (field {name} of {block.scope_ids.usage_id}) "
-                "is unsupported. LearningCoreFieldData only supports the content"
+                "is unsupported. OpenedXCoreFieldData only supports the content"
                 " and settings scopes."
             )
 
 
-class LearningCoreXBlockRuntime(XBlockRuntime):
+class OpenedXCoreRuntime(XBlockRuntime):
     """
-    XBlock runtime that uses openedx-learning apps for content storage.
+    XBlock runtime that uses openedx-core APIs (not ModuleStore).
 
     The superclass is doing all the hard stuff. This class only only has to
     worry about the block storage, block serialization/de-serialization, and
@@ -169,11 +169,11 @@ class LearningCoreXBlockRuntime(XBlockRuntime):
 
     def get_block(self, usage_key, for_parent=None, *, version: int | LatestVersion = LatestVersion.AUTO):
         """
-        Fetch an XBlock from Learning Core data models.
+        Fetch an XBlock from openedx-core data models.
 
-        This method will find the OLX for the content in Learning Core, parse it
+        This method will find the OLX for the content in openedx-core, parse it
         into an XBlock (with mixins) instance, and properly initialize our
-        internal LearningCoreFieldData instance with the field values from the
+        internal OpenedXCoreFieldData instance with the field values from the
         parsed OLX.
         """
         # We can do this more efficiently in a single query later, but for now
@@ -268,7 +268,7 @@ def get_block_assets(self, block, fetch_asset_data):
 
     def save_block(self, block):
         """
-        Save any pending field data values to Learning Core data models.
+        Save any pending field data values to openedx-core data models.
 
         This gets called by block.save() - do not call this directly.
         """
@@ -290,7 +290,7 @@ def save_block(self, block):
                 log.warning("User %s does not have permission to edit %s", self.user.username, block.scope_ids.usage_id)
                 raise RuntimeError("You do not have permission to edit this XBlock")
 
-        serialized = serialize_modulestore_block_for_learning_core(block)
+        serialized = serialize_modulestore_block_for_openedx_core(block)
         now = datetime.now(tz=timezone.utc)
         usage_key = block.scope_ids.usage_id
         with atomic():
@@ -344,7 +344,7 @@ def _get_component_from_usage_key(self, usage_key):
 
     def get_component_version_from_block(self, block):
         """
-        Given an XBlock instance, return the Learning Core ComponentVersion.
+        Given an XBlock instance, return the openedx-core ComponentVersion.
 
         This relies on our runtime setting the _runtime_requested_version
         attribute on blocks that it fetches.
@@ -401,20 +401,20 @@ def _lookup_asset_url(self, block: XBlock, asset_path: str) -> str | None:
         leading "static/" part because it assumes that all files will exist in a
         shared, flat namespace (i.e. a course's Files and Uploads).
 
-        Learning Core treats assets differently. Each Component has its own,
+        openedx-core treats assets differently. Each Component has its own,
         isolated namespace for asset storage. Furthermore, that namespace
         contains content that are not meant to be downloadable, like the
         block.xml (the OLX of the Component). There may one day be other files
         that are not meant to be externally downloadable there as well, like
         Markdown or LaTeX source files or grader code.
 
-        By convention, the static assets that we store in Learning Core and are
+        By convention, the static assets that we store in openedx-core and are
         meant for download sit inside a static/ directory that is local to each
         Component (and actually separate for each Component Version).
 
         So the transformation looks like this:
 
-        1. The Learning Core ComponentVersion has an asset stored as
+        1. The openedx-core ComponentVersion has an asset stored as
            ``static/test.png`` in the database.
         2. The original OLX content we store references ``/static/test.png``,
            per OLX convention. Note the leading "/".
diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index 041450d8a341..0366f903bfa8 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -259,14 +259,14 @@ def applicable_aside_types(self, block: XBlock):
 
     def parse_xml_file(self, fileobj):
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with LearningCoreXBlockRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OpenedXCoreRuntime")
 
     def add_node_as_child(self, block, node):
         """
         Called by XBlock.parse_xml to treat a child node as a child block.
         """
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with LearningCoreXBlockRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OpenedXCoreRuntime")
 
     def service(self, block: XBlock, service_name: str):
         """
@@ -301,7 +301,7 @@ def service(self, block: XBlock, service_name: str):
 
             return DjangoXBlockUserService(
                 self.user,
-                # The value should be updated to whether the user is staff in the context when Learning Core runtime
+                # The value should be updated to whether the user is staff in the context when openedx-core runtime
                 # adds support for courses.
                 user_is_staff=self.user.is_staff,  # type: ignore
                 anonymous_user_id=self.anonymous_student_id,
diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py
index 578db22a5250..88847146a887 100644
--- a/openedx/core/djangoapps/xblock/runtime/shims.py
+++ b/openedx/core/djangoapps/xblock/runtime/shims.py
@@ -102,7 +102,7 @@ def get_python_lib_zip(self):
 
         Only used for capa problems.
         """
-        # TODO: load the python code from Learning Core. Ensure it's not publicly accessible.
+        # TODO: load the python code from openedx-core. Ensure it's not publicly accessible.
         return None
 
     @property
diff --git a/openedx/core/lib/.coveragerc b/openedx/core/lib/.coveragerc
index 94ab6a513d39..a1e0a6404650 100644
--- a/openedx/core/lib/.coveragerc
+++ b/openedx/core/lib/.coveragerc
@@ -1,4 +1,4 @@
-# .coveragerc for Open edX core lib
+# .coveragerc for openedx/core/lib
 [run]
 data_file = reports/openedx/core/lib/.coverage
 source = openedx/core/lib
@@ -8,7 +8,7 @@ parallel = true
 ignore_errors = True
 
 [html]
-title = Open edX Core Lib Python Test Coverage Report
+title = openedx/core/lib Python Test Coverage Report
 directory = reports/openedx/core/lib/cover
 
 [xml]
diff --git a/openedx/core/lib/xblock_serializer/api.py b/openedx/core/lib/xblock_serializer/api.py
index b2a905b2b857..7de37999d233 100644
--- a/openedx/core/lib/xblock_serializer/api.py
+++ b/openedx/core/lib/xblock_serializer/api.py
@@ -17,17 +17,17 @@ def serialize_xblock_to_olx(block):
     return XBlockSerializer(block)
 
 
-def serialize_modulestore_block_for_learning_core(block):
+def serialize_modulestore_block_for_openedx_core(block):
     """
     This class will serialize an XBlock, producing:
-        (1) A new definition ID for use in Learning Core
+        (1) A new definition ID for use in openedx-core
         (2) an XML string defining the XBlock and referencing the IDs of its
             children using <xblock-include /> syntax (which doesn't actually
             contain the OLX of its children, just refers to them, so you have to
             separately serialize them.)
         (3) a list of any static files required by the XBlock and their URL
 
-    TODO: We should deprecate this in favor of a new Learning Core implementation.
+    TODO: We should deprecate this in favor of a new openedx-core implementation.
     We've left it as-is for now partly because there are bigger questions that
     we have around how we should rewrite this (e.g. are we going to
     remove <xblock-include>?).
diff --git a/openedx/core/lib/xblock_serializer/block_serializer.py b/openedx/core/lib/xblock_serializer/block_serializer.py
index 169352730e1c..695dd5842f6b 100644
--- a/openedx/core/lib/xblock_serializer/block_serializer.py
+++ b/openedx/core/lib/xblock_serializer/block_serializer.py
@@ -49,7 +49,7 @@ def __init__(self, block, write_url_name=True, fetch_asset_data=False, write_cop
         runtime_supports_explicit_assets = hasattr(block.runtime, 'get_block_assets')
         if runtime_supports_explicit_assets:
             # If a block supports explicitly tracked assets, things are simple.
-            # Learning Core backed content supports this, which currently means
+            # openedx-core backed content supports this, which currently means
             # v2 Content Libraries.
             self.static_files.extend(
                 block.runtime.get_block_assets(block, fetch_asset_data)
diff --git a/openedx/core/lib/xblock_serializer/test_api.py b/openedx/core/lib/xblock_serializer/test_api.py
index ab97d1d0f919..e8525685020f 100644
--- a/openedx/core/lib/xblock_serializer/test_api.py
+++ b/openedx/core/lib/xblock_serializer/test_api.py
@@ -140,17 +140,17 @@ def test_html_with_static_asset(self):
             ),
         ])
 
-    def test_html_with_static_asset_learning_core(self):
+    def test_html_with_static_asset_openedx_core(self):
         """
-        Test the learning-core-specific serialization of an HTML block
+        Test the openedx-core-specific serialization of an HTML block
         """
         block_id = self.course.id.make_usage_key('html', 'just_img')  # see sample_courses.py
         html_block = modulestore().get_item(block_id)
         serialized = api.serialize_xblock_to_olx(html_block)
-        serialized_learning_core = api.serialize_modulestore_block_for_learning_core(html_block)
+        serialized_openedx_core = api.serialize_modulestore_block_for_openedx_core(html_block)
         self.assertXmlEqual(
-            serialized_learning_core.olx_str,
-            # For learning core, OLX should never contain "url_name" as that ID
+            serialized_openedx_core.olx_str,
+            # For openedx-core, OLX should never contain "url_name" as that ID
             # is specified by the Component key:
             """
             <html display_name="Text"><![CDATA[
@@ -160,7 +160,7 @@ def test_html_with_static_asset_learning_core(self):
         )
         self.assertIn("CDATA", serialized.olx_str)
         # Static files should be identical:
-        self.assertEqual(serialized.static_files, serialized_learning_core.static_files)
+        self.assertEqual(serialized.static_files, serialized_openedx_core.static_files)
 
     def test_html_with_fields(self):
         """ Test an HTML Block with non-default fields like editor='raw' """
diff --git a/openedx/core/lib/xblock_serializer/utils.py b/openedx/core/lib/xblock_serializer/utils.py
index 6f48eef391e7..765cddaa2b34 100644
--- a/openedx/core/lib/xblock_serializer/utils.py
+++ b/openedx/core/lib/xblock_serializer/utils.py
@@ -225,17 +225,18 @@ def override_export_fs(block):
     XmlMixin.export_to_file = old_global_export_to_file
 
 
-def learning_core_def_key_from_modulestore_usage_key(usage_key):
+def openedx_core_def_key_from_modulestore_usage_key(usage_key):
     """
     In modulestore, the "definition key" is a MongoDB ObjectID kept in split's
     definitions table, which theoretically allows the same block to be used in
     many places (each with a unique usage key). However, that functionality is
     not exposed in Studio (other than via content libraries). So when we import
-    into learning core, we assume that each usage is unique, don't generate a usage
-    key, and create a new "definition key" from the original usage key.
+    into the OeX core content API, we assume that each usage is unique, don't
+    generate a usage key, and create a new "definition key" from the original
+    usage key.
     So modulestore usage key
         block-v1:A+B+C+type@html+block@introduction
-    will become learning core definition key
+    will become openedx-core definition key
         html/introduction
     """
     block_type = usage_key.block_type
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 27b38ac72061..a87a47a160cc 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -63,7 +63,7 @@ numpy<2.0.0
 # Date: 2023-09-18
 # pinning this version to avoid updates while the library is being developed
 # Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269
-openedx-learning==0.32.0
+openedx-core==0.34.1
 
 # Date: 2023-11-29
 # Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 54a1ffbcd84a..4b2dcb736a31 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -42,7 +42,7 @@ attrs==25.4.0
     #   lti-consumer-xblock
     #   openedx-authz
     #   openedx-events
-    #   openedx-learning
+    #   openedx-core
     #   referencing
 babel==2.17.0
     # via
@@ -102,7 +102,7 @@ celery==5.6.2
     #   edx-enterprise
     #   enterprise-integrated-channels
     #   event-tracking
-    #   openedx-learning
+    #   openedx-core
 certifi==2026.1.4
     # via
     #   elasticsearch
@@ -236,7 +236,7 @@ django==5.2.11
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -389,7 +389,7 @@ djangorestframework==3.16.1
     #   edx-submissions
     #   openedx-authz
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -469,7 +469,7 @@ edx-drf-extensions==10.6.0
     #   edxval
     #   enterprise-integrated-channels
     #   openedx-authz
-    #   openedx-learning
+    #   openedx-core
 edx-enterprise==6.6.3
     # via
     #   -c requirements/constraints.txt
@@ -832,7 +832,7 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/kernel.in
-openedx-learning==0.32.0
+openedx-core==0.34.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/kernel.in
@@ -1072,7 +1072,7 @@ rules==3.5
     #   -r requirements/edx/kernel.in
     #   edx-enterprise
     #   edx-proctoring
-    #   openedx-learning
+    #   openedx-core
 s3transfer==0.16.0
     # via boto3
 sailthru-client==2.2.3
@@ -1165,7 +1165,7 @@ tinycss2==1.4.0
     # via bleach
 tomlkit==0.14.0
     # via
-    #   openedx-learning
+    #   openedx-core
     #   snowflake-connector-python
 tqdm==4.67.1
     # via nltk
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 3251e0546415..5368fdcf3803 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -95,7 +95,7 @@ attrs==25.4.0
     #   lti-consumer-xblock
     #   openedx-authz
     #   openedx-events
-    #   openedx-learning
+    #   openedx-core
     #   referencing
 babel==2.17.0
     # via
@@ -197,7 +197,7 @@ celery==5.6.2
     #   edx-enterprise
     #   enterprise-integrated-channels
     #   event-tracking
-    #   openedx-learning
+    #   openedx-core
 certifi==2026.1.4
     # via
     #   -r requirements/edx/doc.txt
@@ -412,7 +412,7 @@ django==5.2.11
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -631,7 +631,7 @@ djangorestframework==3.16.1
     #   edx-submissions
     #   openedx-authz
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   super-csv
 djangorestframework-stubs==3.16.7
@@ -751,7 +751,7 @@ edx-drf-extensions==10.6.0
     #   edxval
     #   enterprise-integrated-channels
     #   openedx-authz
-    #   openedx-learning
+    #   openedx-core
 edx-enterprise==6.6.3
     # via
     #   -c requirements/constraints.txt
@@ -1399,7 +1399,7 @@ openedx-forum==0.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-learning==0.32.0
+openedx-core==0.34.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/doc.txt
@@ -1881,7 +1881,7 @@ rules==3.5
     #   -r requirements/edx/testing.txt
     #   edx-enterprise
     #   edx-proctoring
-    #   openedx-learning
+    #   openedx-core
 s3transfer==0.16.0
     # via
     #   -r requirements/edx/doc.txt
@@ -2107,7 +2107,7 @@ tomlkit==0.14.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-    #   openedx-learning
+    #   openedx-core
     #   pylint
     #   snowflake-connector-python
 tox==4.34.1
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 05abbc436a86..a24aa8f4afb0 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -66,7 +66,7 @@ attrs==25.4.0
     #   lti-consumer-xblock
     #   openedx-authz
     #   openedx-events
-    #   openedx-learning
+    #   openedx-core
     #   referencing
 babel==2.17.0
     # via
@@ -147,7 +147,7 @@ celery==5.6.2
     #   edx-enterprise
     #   enterprise-integrated-channels
     #   event-tracking
-    #   openedx-learning
+    #   openedx-core
 certifi==2026.1.4
     # via
     #   -r requirements/edx/base.txt
@@ -299,7 +299,7 @@ django==5.2.11
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -466,7 +466,7 @@ djangorestframework==3.16.1
     #   edx-submissions
     #   openedx-authz
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -558,7 +558,7 @@ edx-drf-extensions==10.6.0
     #   edxval
     #   enterprise-integrated-channels
     #   openedx-authz
-    #   openedx-learning
+    #   openedx-core
 edx-enterprise==6.6.3
     # via
     #   -c requirements/constraints.txt
@@ -1009,7 +1009,7 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/base.txt
-openedx-learning==0.32.0
+openedx-core==0.34.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt
@@ -1312,7 +1312,7 @@ rules==3.5
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-    #   openedx-learning
+    #   openedx-core
 s3transfer==0.16.0
     # via
     #   -r requirements/edx/base.txt
@@ -1480,7 +1480,7 @@ tinycss2==1.4.0
 tomlkit==0.14.0
     # via
     #   -r requirements/edx/base.txt
-    #   openedx-learning
+    #   openedx-core
     #   snowflake-connector-python
 tqdm==4.67.1
     # via
diff --git a/requirements/edx/kernel.in b/requirements/edx/kernel.in
index e71e6aaef08c..26448abf177d 100644
--- a/requirements/edx/kernel.in
+++ b/requirements/edx/kernel.in
@@ -113,11 +113,11 @@ oauthlib                            # OAuth specification support for authentica
 olxcleaner
 openedx-atlas                       # CLI tool to manage translations
 openedx-calc                        # Library supporting mathematical calculations for Open edX
+openedx-core                        # Open edX Core: Content, Tagging, and other foundational APIs
 openedx-django-require
 openedx-events                      # Open edX Events from Hooks Extension Framework (OEP-50)
 openedx-filters                     # Open edX Filters from Hooks Extension Framework (OEP-50)
 openedx-forum                       # Open edX forum v2 application
-openedx-learning                    # Open edX Learning core (experimental)
 openedx-django-wiki
 path
 piexif                              # Exif image metadata manipulation, used in the profile_images app
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index d30dc79442f9..d7a8e491a742 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -67,7 +67,7 @@ attrs==25.4.0
     #   lti-consumer-xblock
     #   openedx-authz
     #   openedx-events
-    #   openedx-learning
+    #   openedx-core
     #   referencing
 babel==2.17.0
     # via
@@ -147,7 +147,7 @@ celery==5.6.2
     #   edx-enterprise
     #   enterprise-integrated-channels
     #   event-tracking
-    #   openedx-learning
+    #   openedx-core
 certifi==2026.1.4
     # via
     #   -r requirements/edx/base.txt
@@ -326,7 +326,7 @@ django==5.2.11
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -493,7 +493,7 @@ djangorestframework==3.16.1
     #   edx-submissions
     #   openedx-authz
     #   openedx-forum
-    #   openedx-learning
+    #   openedx-core
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -580,7 +580,7 @@ edx-drf-extensions==10.6.0
     #   edxval
     #   enterprise-integrated-channels
     #   openedx-authz
-    #   openedx-learning
+    #   openedx-core
 edx-enterprise==6.6.3
     # via
     #   -c requirements/constraints.txt
@@ -1059,7 +1059,7 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/base.txt
-openedx-learning==0.32.0
+openedx-core==0.34.1
     # via
     #   -c requirements/constraints.txt
     #   -r requirements/edx/base.txt
@@ -1429,7 +1429,7 @@ rules==3.5
     #   -r requirements/edx/base.txt
     #   edx-enterprise
     #   edx-proctoring
-    #   openedx-learning
+    #   openedx-core
 s3transfer==0.16.0
     # via
     #   -r requirements/edx/base.txt
@@ -1557,7 +1557,7 @@ tinycss2==1.4.0
 tomlkit==0.14.0
     # via
     #   -r requirements/edx/base.txt
-    #   openedx-learning
+    #   openedx-core
     #   pylint
     #   snowflake-connector-python
 tox==4.34.1
diff --git a/xmodule/README.rst b/xmodule/README.rst
index 8bbae713b7a4..bcf5d4bc73fa 100644
--- a/xmodule/README.rst
+++ b/xmodule/README.rst
@@ -41,16 +41,15 @@ Direction
 Currently, this directory contains a lot of mission-critical functionality, so continued maintenance and simplification of it is important.
 Still, we aim to eventually dissolve the directory in favor of more focused & decoupled subsystems:
 
-* ModuleStore is superseded by the `Learning Core`_ storage backend.
-* Learning Core-backend content is rendered by a new, simplified `edx-platform XBlock runtime`_.
-* Navigation, partitioning, and composition of learning content is being re-architected in the `openedx-learning`_ library.
+* ModuleStore is superseded by the `Open edX Core`_ (a.k.a. ``openedx-core``) storage backend.
+* openedx-core-backed content is rendered by a new, simplified `edx-platform XBlock runtime`_.
+* Navigation, partitioning, and composition of learning content is being re-architected in the `openedx-core`_ library.
 * All new XBlocks are implemented in separate repositories, such as `xblock-drag-and-drop-v2`_.
 
 To help with this direction, please **do not add new functionality to this directory**. If you feel that you need to add code to this directory, reach out on `the forums`_; it's likely that someone can help you find a different way to implement your change that will be more robust and architecturally sound!
 
-.. _Learning Core: https://github.com/openedx/openedx-learning/
+.. _Open edX Core: https://github.com/openedx/openedx-core/
 .. _edx-platform XBlock runtime: https://github.com/openedx/edx-platform/tree/master/openedx/core/djangoapps/xblock
-.. _openedx-learning: https://github.com/openedx/openedx-learning
+.. _openedx-core: https://github.com/openedx/openedx-core
 .. _xblock-drag-and-drop-v2: https://github.com/openedx/xblock-drag-and-drop-v2
 .. _the forums: https://discuss.openedx.org
-
diff --git a/xmodule/html_block.py b/xmodule/html_block.py
index d0f85ae10be0..9e1615afc05c 100644
--- a/xmodule/html_block.py
+++ b/xmodule/html_block.py
@@ -297,7 +297,7 @@ def load_definition(cls, xml_object, system, location, id_generator):  # lint-am
     @classmethod
     def parse_xml_new_runtime(cls, node, runtime, keys):
         """
-        Parse XML in the new learning-core-based runtime. Since it doesn't yet
+        Parse XML in the new openedx-core-based runtime. Since it doesn't yet
         support loading separate .html files, the HTML data is assumed to be in
         a CDATA child or otherwise just inline in the OLX.
         """
diff --git a/xmodule/library_content_block.py b/xmodule/library_content_block.py
index 2f9e403b2637..5fa80545f725 100644
--- a/xmodule/library_content_block.py
+++ b/xmodule/library_content_block.py
@@ -3,7 +3,7 @@
 
 In Studio, it's called the "Randomized Content Module".
 
-In the long-term, this block is deprecated in favor of "v2" (learning core-backed) library references:
+In the long-term, this block is deprecated in favor of "v2" (openedx-core-backed) library references:
 https://github.com/openedx/edx-platform/issues/32457
 
 We need to retain backwards-compatibility, but please do not build any new features into this.
diff --git a/xmodule/library_tools.py b/xmodule/library_tools.py
index 52a31c0608ea..a1829812911b 100644
--- a/xmodule/library_tools.py
+++ b/xmodule/library_tools.py
@@ -24,7 +24,7 @@ class LegacyLibraryToolsService:
     """
     Service for LegacyLibraryContentBlock.
 
-    Allows to interact with libraries in the modulestore and learning core.
+    Allows to interact with libraries in the modulestore and openedx-core.
 
     Should only be used in the CMS.
     """
diff --git a/xmodule/raw_block.py b/xmodule/raw_block.py
index f887213d5a8b..6dc9cc920c40 100644
--- a/xmodule/raw_block.py
+++ b/xmodule/raw_block.py
@@ -66,7 +66,7 @@ def parse_xml_new_runtime(cls, node, runtime, keys):
         Interpret the parsed XML in `node`, creating a new instance of this
         module.
         """
-        # In the new/learning-core-based runtime, XModule parsing (from
+        # In the new/openedx-core-based runtime, XModule parsing (from
         # XmlMixin) is disabled, so definition_from_xml will not be
         # called, and instead the "normal" XBlock parse_xml will be used.
         # However, it's not compatible with RawMixin, so we implement
diff --git a/xmodule/video_block/video_handlers.py b/xmodule/video_block/video_handlers.py
index adc59ae740d6..390c15e05dc6 100644
--- a/xmodule/video_block/video_handlers.py
+++ b/xmodule/video_block/video_handlers.py
@@ -357,7 +357,7 @@ def student_view_user_state(self, request, suffix=''):  # lint-amnesty, pylint:
     def yt_video_metadata(self, request, suffix=''):  # lint-amnesty, pylint: disable=unused-argument
         """
         Endpoint to get YouTube metadata.
-        This handler is only used in the Learning-Core-based runtime. The old
+        This handler is only used in the openedx-core-based runtime. The old
         runtime uses a similar REST API that's not an XBlock handler.
         """
         from lms.djangoapps.courseware.views.views import load_metadata_from_youtube
diff --git a/xmodule/xml_block.py b/xmodule/xml_block.py
index 951106fba42d..dac8fd93d37b 100644
--- a/xmodule/xml_block.py
+++ b/xmodule/xml_block.py
@@ -422,7 +422,7 @@ def add_applicable_asides_to_block(cls, block, runtime, aside_children):
     @classmethod
     def parse_xml_new_runtime(cls, node, runtime, keys):
         """
-        This XML lives within Learning Core and the new runtime doesn't need this
+        This XML lives within openedx-core and the new runtime doesn't need this
         legacy XModule code. Use the "normal" XBlock parsing code.
         """
         try:

From 84cefb7fe193a157642dad9a3013950b17ad23c2 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 18 Feb 2026 13:37:42 -0500
Subject: [PATCH 2/5] style: Re-alphabetize openedx-core in requirements list

---
 requirements/edx/base.txt        | 14 +++++++-------
 requirements/edx/development.txt | 16 ++++++++--------
 requirements/edx/doc.txt         | 14 +++++++-------
 requirements/edx/testing.txt     | 14 +++++++-------
 4 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 4b2dcb736a31..8e96c5d1de83 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -41,8 +41,8 @@ attrs==25.4.0
     #   jsonschema
     #   lti-consumer-xblock
     #   openedx-authz
-    #   openedx-events
     #   openedx-core
+    #   openedx-events
     #   referencing
 babel==2.17.0
     # via
@@ -231,12 +231,12 @@ django==5.2.11
     #   jsonfield
     #   lti-consumer-xblock
     #   openedx-authz
+    #   openedx-core
     #   openedx-django-pyfs
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -388,8 +388,8 @@ djangorestframework==3.16.1
     #   edx-proctoring
     #   edx-submissions
     #   openedx-authz
-    #   openedx-forum
     #   openedx-core
+    #   openedx-forum
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -808,6 +808,10 @@ openedx-authz==0.20.0
     # via -r requirements/edx/kernel.in
 openedx-calc==4.0.3
     # via -r requirements/edx/kernel.in
+openedx-core==0.34.1
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/edx/kernel.in
 openedx-django-pyfs==3.8.0
     # via
     #   lti-consumer-xblock
@@ -832,10 +836,6 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/kernel.in
-openedx-core==0.34.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/edx/kernel.in
 optimizely-sdk==5.4.0
     # via -r requirements/edx/bundled.in
 ora2==6.17.2
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 5368fdcf3803..2a7932adf01d 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -94,8 +94,8 @@ attrs==25.4.0
     #   jsonschema
     #   lti-consumer-xblock
     #   openedx-authz
-    #   openedx-events
     #   openedx-core
+    #   openedx-events
     #   referencing
 babel==2.17.0
     # via
@@ -407,12 +407,12 @@ django==5.2.11
     #   jsonfield
     #   lti-consumer-xblock
     #   openedx-authz
+    #   openedx-core
     #   openedx-django-pyfs
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -630,8 +630,8 @@ djangorestframework==3.16.1
     #   edx-proctoring
     #   edx-submissions
     #   openedx-authz
-    #   openedx-forum
     #   openedx-core
+    #   openedx-forum
     #   ora2
     #   super-csv
 djangorestframework-stubs==3.16.7
@@ -1365,6 +1365,11 @@ openedx-calc==4.0.3
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
+openedx-core==0.34.1
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/edx/doc.txt
+    #   -r requirements/edx/testing.txt
 openedx-django-pyfs==3.8.0
     # via
     #   -r requirements/edx/doc.txt
@@ -1399,11 +1404,6 @@ openedx-forum==0.4.0
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
-openedx-core==0.34.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/edx/doc.txt
-    #   -r requirements/edx/testing.txt
 optimizely-sdk==5.4.0
     # via
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index a24aa8f4afb0..040838177ad3 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -65,8 +65,8 @@ attrs==25.4.0
     #   jsonschema
     #   lti-consumer-xblock
     #   openedx-authz
-    #   openedx-events
     #   openedx-core
+    #   openedx-events
     #   referencing
 babel==2.17.0
     # via
@@ -294,12 +294,12 @@ django==5.2.11
     #   jsonfield
     #   lti-consumer-xblock
     #   openedx-authz
+    #   openedx-core
     #   openedx-django-pyfs
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -465,8 +465,8 @@ djangorestframework==3.16.1
     #   edx-proctoring
     #   edx-submissions
     #   openedx-authz
-    #   openedx-forum
     #   openedx-core
+    #   openedx-forum
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -984,6 +984,10 @@ openedx-authz==0.20.0
     # via -r requirements/edx/base.txt
 openedx-calc==4.0.3
     # via -r requirements/edx/base.txt
+openedx-core==0.34.1
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/edx/base.txt
 openedx-django-pyfs==3.8.0
     # via
     #   -r requirements/edx/base.txt
@@ -1009,10 +1013,6 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/base.txt
-openedx-core==0.34.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/edx/base.txt
 optimizely-sdk==5.4.0
     # via -r requirements/edx/base.txt
 ora2==6.17.2
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index d7a8e491a742..244551ac7f59 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -66,8 +66,8 @@ attrs==25.4.0
     #   jsonschema
     #   lti-consumer-xblock
     #   openedx-authz
-    #   openedx-events
     #   openedx-core
+    #   openedx-events
     #   referencing
 babel==2.17.0
     # via
@@ -321,12 +321,12 @@ django==5.2.11
     #   jsonfield
     #   lti-consumer-xblock
     #   openedx-authz
+    #   openedx-core
     #   openedx-django-pyfs
     #   openedx-django-wiki
     #   openedx-events
     #   openedx-filters
     #   openedx-forum
-    #   openedx-core
     #   ora2
     #   social-auth-app-django
     #   super-csv
@@ -492,8 +492,8 @@ djangorestframework==3.16.1
     #   edx-proctoring
     #   edx-submissions
     #   openedx-authz
-    #   openedx-forum
     #   openedx-core
+    #   openedx-forum
     #   ora2
     #   super-csv
 djangorestframework-xml==2.0.0
@@ -1034,6 +1034,10 @@ openedx-authz==0.20.0
     # via -r requirements/edx/base.txt
 openedx-calc==4.0.3
     # via -r requirements/edx/base.txt
+openedx-core==0.34.1
+    # via
+    #   -c requirements/constraints.txt
+    #   -r requirements/edx/base.txt
 openedx-django-pyfs==3.8.0
     # via
     #   -r requirements/edx/base.txt
@@ -1059,10 +1063,6 @@ openedx-filters==2.1.0
     #   ora2
 openedx-forum==0.4.0
     # via -r requirements/edx/base.txt
-openedx-core==0.34.1
-    # via
-    #   -c requirements/constraints.txt
-    #   -r requirements/edx/base.txt
 optimizely-sdk==5.4.0
     # via -r requirements/edx/base.txt
 ora2==6.17.2

From e10c49dbfcebf692bacfd9e459f8a354ad8a6ffc Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 18 Feb 2026 14:37:55 -0500
Subject: [PATCH 3/5] refactor: Refer to openedx_content, not openedx-core,
 wherever appropriate

openedx-core is the repo and PyPI project name.
openedx_content is the concrete code API within openedx-core
which the new XBlock runtime uses.
---
 .../contentstore/views/component.py           |  2 +-
 .../contentstore/views/transcripts_ajax.py    | 14 ++---
 cms/djangoapps/modulestore_migrator/admin.py  |  2 +-
 .../modulestore_migrator/api/read_api.py      |  8 +--
 cms/djangoapps/modulestore_migrator/data.py   |  4 +-
 cms/djangoapps/modulestore_migrator/models.py |  2 +-
 .../modulestore_migrator/rest_api/v1/views.py |  4 +-
 cms/djangoapps/modulestore_migrator/tasks.py  | 10 ++--
 cms/envs/common.py                            |  2 +-
 cms/envs/test.py                              |  2 +-
 cms/lib/xblock/upstream_sync.py               |  2 +-
 common/djangoapps/track/contexts.py           |  2 +-
 common/templates/xblock_v2/xblock_iframe.html |  6 +-
 docs/concepts/extension_points.rst            |  2 +-
 docs/decisions/0020-upstream-downstream.rst   |  2 +-
 lms/djangoapps/edxnotes/tests.py              |  4 +-
 lms/envs/common.py                            |  2 +-
 lms/urls.py                                   |  2 +-
 .../djangoapps/content/search/documents.py    |  6 +-
 .../content_libraries/api/blocks.py           | 12 ++--
 .../api/courseware_import.py                  |  4 +-
 .../content_libraries/api/libraries.py        |  6 +-
 .../0001-index-libraries-in-elasticsearch.rst |  6 +-
 .../content_libraries/library_context.py      |  2 +-
 .../commands/content_libraries_import.py      |  2 +-
 .../djangoapps/content_libraries/models.py    |  8 +--
 .../content_libraries/permissions.py          |  2 +-
 .../content_libraries/rest_api/blocks.py      |  4 +-
 .../content_libraries/rest_api/libraries.py   |  4 +-
 .../content_libraries/rest_api/serializers.py |  2 +-
 .../djangoapps/content_libraries/tasks.py     |  6 +-
 .../content_libraries/tests/base.py           |  4 +-
 .../tests/test_containers.py                  |  2 +-
 .../tests/test_content_libraries.py           | 12 ++--
 .../tests/test_course_to_library.py           |  2 +-
 .../tests/test_embed_block.py                 |  2 +-
 .../content_libraries/tests/test_events.py    |  4 +-
 .../content_libraries/tests/test_runtime.py   | 12 ++--
 .../tests/test_static_assets.py               |  8 +--
 .../content_libraries/tests/test_views_lti.py |  2 +-
 .../djangoapps/content_staging/README.rst     |  2 +-
 openedx/core/djangoapps/olx_rest_api/views.py |  8 +--
 .../core/djangoapps/video_config/services.py  |  4 +-
 .../video_config/transcripts_utils.py         | 14 ++---
 openedx/core/djangoapps/xblock/README.rst     |  2 +-
 openedx/core/djangoapps/xblock/api.py         | 16 +++---
 openedx/core/djangoapps/xblock/apps.py        |  6 +-
 ..._runtime.py => openedx_content_runtime.py} | 56 +++++++++----------
 .../core/djangoapps/xblock/runtime/runtime.py |  6 +-
 .../core/djangoapps/xblock/runtime/shims.py   |  2 +-
 openedx/core/lib/xblock_serializer/api.py     |  6 +-
 .../lib/xblock_serializer/block_serializer.py |  3 +-
 .../core/lib/xblock_serializer/test_api.py    | 12 ++--
 openedx/core/lib/xblock_serializer/utils.py   |  2 +-
 xmodule/README.rst                            | 11 ++--
 xmodule/html_block.py                         |  2 +-
 xmodule/library_content_block.py              |  2 +-
 xmodule/library_tools.py                      |  2 +-
 xmodule/raw_block.py                          |  2 +-
 xmodule/video_block/video_handlers.py         |  2 +-
 60 files changed, 173 insertions(+), 171 deletions(-)
 rename openedx/core/djangoapps/xblock/runtime/{openedx_core_runtime.py => openedx_content_runtime.py} (91%)

diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py
index 7fc4314c4ecd..8b16fdbad80d 100644
--- a/cms/djangoapps/contentstore/views/component.py
+++ b/cms/djangoapps/contentstore/views/component.py
@@ -614,7 +614,7 @@ def get_unit_tags(usage_key):
     Get the tags of a Unit and build a json to be read by the UI
 
     Note: When migrating the `TagList` subview from `container_subview.js` to the course-authoring MFE,
-    this function can be simplified to use the REST API of openedx-core,
+    this function can be simplified to use the REST API of openedx_tagging,
     which already provides this grouping + sorting logic.
     """
     # Get content tags from content tagging API
diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py
index 2a7c0d97f100..7d4eccf7000b 100644
--- a/cms/djangoapps/contentstore/views/transcripts_ajax.py
+++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py
@@ -91,18 +91,18 @@ def link_video_to_component(video_component, user):
     return edx_video_id
 
 
-def save_video_transcript_in_openedx_core(
+def save_video_transcript_in_openedx_content(
     usage_key,
     input_format,
     transcript_content,
     language_code
 ):
     """
-    Saves a video transcript with the openedx-core Content API.
+    Saves a video transcript with the openedx_content API.
 
-    openedx-core uses the standard `.srt` format for subtitles.
+    openedx_content uses the standard `.srt` format for subtitles.
     Note: SJSON is an edx-specific format that we're trying to move away from,
-    so for all new stuff related to openedx-core should only use `.srt`.
+    so for all new stuff related to openedx_content should only use `.srt`.
 
     Arguments:
         usage_key: UsageKey of the block
@@ -615,7 +615,7 @@ def choose_transcripts(request):
 
         # 3. Upload the retrieved transcript to DS for the linked video ID.
         if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-            success = save_video_transcript_in_openedx_core(
+            success = save_video_transcript_in_openedx_content(
                 video.usage_key,
                 input_format,
                 transcript_content,
@@ -669,7 +669,7 @@ def rename_transcripts(request):
 
         # 3. Upload the retrieved transcript to DS for the linked video ID.
         if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-            success = save_video_transcript_in_openedx_core(
+            success = save_video_transcript_in_openedx_content(
                 video.usage_key,
                 input_format,
                 transcript_content,
@@ -725,7 +725,7 @@ def replace_transcripts(request):
         for transcript in transcript_content:
             [language_code, json_content] = transcript
             if isinstance(video.usage_key.context_key, LibraryLocatorV2):
-                success = save_video_transcript_in_openedx_core(
+                success = save_video_transcript_in_openedx_content(
                     video.usage_key,
                     Transcript.SJSON,
                     json_content,
diff --git a/cms/djangoapps/modulestore_migrator/admin.py b/cms/djangoapps/modulestore_migrator/admin.py
index 4165c1ad6918..1a06170d294b 100644
--- a/cms/djangoapps/modulestore_migrator/admin.py
+++ b/cms/djangoapps/modulestore_migrator/admin.py
@@ -1,5 +1,5 @@
 """
-A nice little admin interface for migrating courses and libraries from modulstore to openedx-core.
+A nice little admin interface for migrating courses and libraries from modulstore to openedx_content.
 """
 import logging
 
diff --git a/cms/djangoapps/modulestore_migrator/api/read_api.py b/cms/djangoapps/modulestore_migrator/api/read_api.py
index 5249a905af66..3e48adc0dc1a 100644
--- a/cms/djangoapps/modulestore_migrator/api/read_api.py
+++ b/cms/djangoapps/modulestore_migrator/api/read_api.py
@@ -47,7 +47,7 @@
 
 def get_forwarding_for_blocks(source_keys: t.Iterable[UsageKey]) -> dict[UsageKey, ModulestoreBlockMigrationSuccess]:
     """
-    Authoritatively determine how some Modulestore blocks have been migrated to openedx-core.
+    Authoritatively determine how some Modulestore blocks have been migrated to openedx_content.
 
     Returns a mapping from source usage keys to block migration data objects. Each block migration object
     holds the target usage key and title. If a source key is missing from the mapping, then it has not
@@ -79,7 +79,7 @@ def get_forwarding_for_blocks(source_keys: t.Iterable[UsageKey]) -> dict[UsageKe
 
 def is_forwarded(source_key: SourceContextKey) -> bool:
     """
-    Has this course or legacy library been authoratively migrated to openedx-core,
+    Has this course or legacy library been authoratively migrated to openedx_content,
     such that references to the source course/library should be forwarded to the target library?
     """
     return get_forwarding(source_key) is not None
@@ -87,7 +87,7 @@ def is_forwarded(source_key: SourceContextKey) -> bool:
 
 def get_forwarding(source_key: SourceContextKey) -> ModulestoreMigration | None:
     """
-    Authoritatively determine how some Modulestore course or legacy library has been migrated to openedx-core.
+    Authoritatively determine how some Modulestore course or legacy library has been migrated to openedx_content.
 
     If no such successful migration exists, returns None.
 
@@ -123,7 +123,7 @@ def get_migrations(
     is_failed: bool | None = None,
 ) -> t.Generator[ModulestoreMigration]:
     """
-    Given some criteria, get all modulestore->openedx-core migrations.
+    Given some criteria, get all modulestore->openedx_content migrations.
 
     Returns an iterable, ordered from NEWEST to OLDEST.
 
diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
index ea943ea8e6ec..0f8e5864b7e0 100644
--- a/cms/djangoapps/modulestore_migrator/data.py
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -92,7 +92,7 @@ def default(cls) -> RepeatHandlingStrategy:
 @dataclass(frozen=True)
 class ModulestoreMigration:
     """
-    Metadata on a migration of a course or legacy library to a v2 library in openedx-core.
+    Metadata on a migration of a course or legacy library to a v2 library in openedx_content.
     """
     pk: int
     source_key: SourceContextKey
@@ -107,7 +107,7 @@ class ModulestoreMigration:
 @dataclass(frozen=True)
 class ModulestoreBlockMigrationResult:
     """
-    Base class for a modulestore block that was part of an attempted migration to openedx-core.
+    Base class for a modulestore block that was part of an attempted migration to openedx_content.
     """
     source_key: UsageKey
     is_failed: t.ClassVar[bool]
diff --git a/cms/djangoapps/modulestore_migrator/models.py b/cms/djangoapps/modulestore_migrator/models.py
index bbf431faf3f3..17da8e18708f 100644
--- a/cms/djangoapps/modulestore_migrator/models.py
+++ b/cms/djangoapps/modulestore_migrator/models.py
@@ -68,7 +68,7 @@ def __str__(self):
 class ModulestoreMigration(models.Model):
     """
     Tracks the action of a user importing a Modulestore-based course or legacy library into a
-    openedx-core based learning package
+    openedx_content based learning package
 
     Notes:
     * As of Ulmo, a learning package is always associated with a v2 content library, but we
diff --git a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
index 48cdb5013849..18f066291088 100644
--- a/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
+++ b/cms/djangoapps/modulestore_migrator/rest_api/v1/views.py
@@ -75,7 +75,7 @@
 )
 class MigrationViewSet(StatusViewSet):
     """
-    JSON HTTP API to create and check on ModuleStore-to-openedx-core migration tasks.
+    JSON HTTP API to create and check on ModuleStore-to-openedx_content migration tasks.
     """
 
     authentication_classes = (
@@ -257,7 +257,7 @@ def create(self, request, *args, **kwargs):
 
 class BulkMigrationViewSet(StatusViewSet):
     """
-    JSON HTTP API to bulk-create ModuleStore-to-openedx-core migration tasks.
+    JSON HTTP API to bulk-create ModuleStore-to-openedx_content migration tasks.
     """
 
     authentication_classes = (
diff --git a/cms/djangoapps/modulestore_migrator/tasks.py b/cms/djangoapps/modulestore_migrator/tasks.py
index f10b60a0f062..7d8d4f2e7f0a 100644
--- a/cms/djangoapps/modulestore_migrator/tasks.py
+++ b/cms/djangoapps/modulestore_migrator/tasks.py
@@ -61,7 +61,7 @@
 
 class MigrationStep(Enum):
     """
-    Strings representation the state of an in-progress modulestore-to-openedx-core import.
+    Strings representation the state of an in-progress modulestore-to-openedx_content import.
 
     We use these values to set UserTaskStatus.state.
     The other possible UserTaskStatus.state values are the built-in ones:
@@ -313,16 +313,16 @@ def _import_structure(
     status: UserTaskStatus,
 ) -> tuple[t.Any, _MigratedNode]:
     """
-    Import the staged content structure into the target openedx-core library.
+    Import the staged content structure into the target openedx_content library.
 
     Args:
         migration (ModulestoreMigration):
-            The migration record representing the ongoing modulestore-to-openedx-core migration.
+            The migration record representing the ongoing modulestore-to-openedx_content migration.
         source_data (_MigrationSourceData):
             Data extracted from the legacy modulestore, including the source root usage key.
             Use `_validate_input()` to generate this data.
         target_library (libraries_api.ContentLibraryMetadata):
-            The target library where the new openedx-core content will be created.
+            The target library where the new openedx_content content will be created.
         content_by_filename (dict[str, int]):
             A mapping between OLX file names and their associated file IDs in the staging area.
             Use `_import_assets` to generate this content.
@@ -338,7 +338,7 @@ def _import_structure(
                   `content_api.bulk_draft_changes_for`, containing all the imported changes.
                 - The second element (`root_migrated_node`): a `_MigratedNode` object that
                   represents the mapping between the legacy root node and its newly created
-                  openedx-core equivalent.
+                  openedx_content equivalent.
     """
     migration = source_data.migration
     migration_context = _MigrationContext(
diff --git a/cms/envs/common.py b/cms/envs/common.py
index 0b465cb37cc9..44c4ee4e2f9b 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -712,7 +712,7 @@ def make_lms_template_path(settings):
     'cms.djangoapps.export_course_metadata.apps.ExportCourseMetadataConfig',
     'cms.djangoapps.modulestore_migrator',
 
-    # New (openedx-core-based) XBlock runtime
+    # New (openedx_content-based) XBlock runtime
     'openedx.core.djangoapps.xblock.apps.StudioXBlockAppConfig',
 
     'openedx.core.djangoapps.util.apps.UtilConfig',
diff --git a/cms/envs/test.py b/cms/envs/test.py
index feee4f820f33..d8cd3f3f9577 100644
--- a/cms/envs/test.py
+++ b/cms/envs/test.py
@@ -210,7 +210,7 @@
 
 RATELIMIT_RATE = '2/m'
 
-############## Open edX Core (openedx-core) config ##############
+############## openedx_content config ##############
 OPENEDX_LEARNING = {
     "MEDIA": {"BACKEND": "django.core.files.storage.InMemoryStorage", "OPTIONS": {"location": MEDIA_ROOT + "_private"}}
 }
diff --git a/cms/lib/xblock/upstream_sync.py b/cms/lib/xblock/upstream_sync.py
index 1ce2f917b039..2af27b020efb 100644
--- a/cms/lib/xblock/upstream_sync.py
+++ b/cms/lib/xblock/upstream_sync.py
@@ -3,7 +3,7 @@
 usages.
 
 At the time of writing, we assume that for any upstream-downstream linkage:
-* The upstream is a Component or Container from a openedx-core-backed Content
+* The upstream is a Component or Container from a openedx_content-backed Content
   Library.
 * The downstream is a block of compatible type in a SplitModuleStore-backed
   Course.
diff --git a/common/djangoapps/track/contexts.py b/common/djangoapps/track/contexts.py
index 191f4856259d..a525a8c23858 100644
--- a/common/djangoapps/track/contexts.py
+++ b/common/djangoapps/track/contexts.py
@@ -48,7 +48,7 @@ def course_context_from_course_id(course_id):
     """
     Creates a course context from a `course_id`.
 
-    For newer parts of the system (i.e. openedx-core-based libraries/courses/etc.)
+    For newer parts of the system (i.e. openedx_content-based libraries/courses/etc.)
     use context_dict_for_learning_context instead of this method.
 
     Example Returned Context::
diff --git a/common/templates/xblock_v2/xblock_iframe.html b/common/templates/xblock_v2/xblock_iframe.html
index 95fba646c38b..358765c85eb4 100644
--- a/common/templates/xblock_v2/xblock_iframe.html
+++ b/common/templates/xblock_v2/xblock_iframe.html
@@ -286,7 +286,7 @@
                 // Does the XBlock HTML contain arguments to pass to the InitFunction?
                 let data = {};
                 [].forEach.call(element.children, (childNode) => {
-                    // The newer/pure/openedx-core runtime uses 'xblock_json_init_args'
+                    // The newer/pure/openedx_content runtime uses 'xblock_json_init_args'
                     // while the LMS runtime uses 'xblock-json-init-args'.
                     if (
                         childNode.matches('script.xblock_json_init_args')
@@ -421,7 +421,7 @@
 
         // Recursively initialize the JavaScript code of each XBlock:
         function initializeXBlockAndChildren(element, callback) {
-            // The newer/pure/openedx-core runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
+            // The newer/pure/openedx_content runtime uses the 'data-usage' attribute, while the LMS uses 'data-usage-id'
             const usageId = element.getAttribute('data-usage') || element.getAttribute('data-usage-id');
             if (usageId !== null) {
                 element[USAGE_ID_KEY] = usageId;
@@ -461,7 +461,7 @@
         }
 
         // Find the root XBlock node.
-        // The newer/pure/openedx-core runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
+        // The newer/pure/openedx_content runtime uses '.xblock-v1' while the LMS runtime uses '.xblock'.
         const rootNode = document.querySelector('.xblock, .xblock-v1'); // will always return the first matching element
         initializeXBlockAndChildren(rootNode, () => {
         });
diff --git a/docs/concepts/extension_points.rst b/docs/concepts/extension_points.rst
index 969881873978..10024bd31642 100644
--- a/docs/concepts/extension_points.rst
+++ b/docs/concepts/extension_points.rst
@@ -124,7 +124,7 @@ Here are the different integration points that python plugins can use:
      - By default, the registration page for each instance of Open edX has fields that ask for information such as a user’s name, country, and highest level of education completed. You can add custom fields to the registration page for your own Open edX instance. These fields can be different types, including text entry fields and drop-down lists. See `Adding Custom Fields to the Registration Page`_.
    * - Learning Context (``openedx.learning_context``)
      - Trial, Limited
-     - A "Learning Context" is a course, a library, a program, a blog, an external site, or some other collection of content where learning happens. If you are trying to build a totally new learning experience that's not a type of course, you may need to implement a new learning context. Learning contexts are a new abstraction and are only supported in the nascent openedx-core-based XBlock runtime. Since existing courses use modulestore instead of openedx-core, they are not yet implemented as learning contexts. However, openedx-core-based content libraries are. See |learning_context.py|_ to learn more.
+     - A "Learning Context" is a course, a library, a program, a blog, an external site, or some other collection of content where learning happens. If you are trying to build a totally new learning experience that's not a type of course, you may need to implement a new learning context. Learning contexts are a new abstraction and are only supported in the nascent openedx_content-based XBlock runtime. Since existing courses use modulestore instead of openedx_content, they are not yet implemented as learning contexts. However, openedx_content-based content libraries are. See |learning_context.py|_ to learn more.
    * - User partition scheme (``openedx.user_partition_scheme`` and ``openedx.dynamic_partition_generator``)
      - Unknown, Stable
      - A user partition scheme is a named way for dividing users in a course into groups, usually to show different content to different users or to run experiments. Partitions may be added to a course manually, or automatically added by a "dynamic partition generator." The core platform includes partition scheme plugins like ``random``, ``cohort``, and ``enrollment_track``. See the |UserPartition docstring|_ to learn more.
diff --git a/docs/decisions/0020-upstream-downstream.rst b/docs/decisions/0020-upstream-downstream.rst
index 47dbb2c88b41..2661e9f9d681 100644
--- a/docs/decisions/0020-upstream-downstream.rst
+++ b/docs/decisions/0020-upstream-downstream.rst
@@ -13,7 +13,7 @@ Context
 
 We are replacing the existing Legacy ("V1") Content Libraries system, based on
 ModuleStore, with a Relaunched ("V2") Content Libraries  system, based on
-openedx-core. V1 and V2 libraries will coexist for at least one release to
+openedx_content. V1 and V2 libraries will coexist for at least one release to
 allow for migration; eventually, V1 libraries will be removed entirely.
 
 Content from V1 libraries can only be included into courses using the
diff --git a/lms/djangoapps/edxnotes/tests.py b/lms/djangoapps/edxnotes/tests.py
index 6c6ba4287a99..46920e927ad9 100644
--- a/lms/djangoapps/edxnotes/tests.py
+++ b/lms/djangoapps/edxnotes/tests.py
@@ -167,9 +167,9 @@ def test_edxnotes_studio(self):
         self.problem.runtime.is_author_mode = True
         assert 'original_get_html' == self.problem.get_html()
 
-    def test_edxnotes_openedx_core_runtime(self):
+    def test_edxnotes_openedx_content_runtime(self):
         """
-        Tests that get_html is not wrapped when problem is rendered by the openedx-core runtime.
+        Tests that get_html is not wrapped when problem is rendered by the openedx_content runtime.
         """
         del self.problem.block.runtime.modulestore
         assert 'original_get_html' == self.problem.get_html()
diff --git a/lms/envs/common.py b/lms/envs/common.py
index aeebf95d4cd8..917dd025e96f 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1780,7 +1780,7 @@
     # User tours
     'lms.djangoapps.user_tours',
 
-    # New XBlock runtime, based on openedx-core Content API
+    # New XBlock runtime, based on openedx_content
     'openedx.core.djangoapps.xblock.apps.LmsXBlockAppConfig',
 
     # Student support tools
diff --git a/lms/urls.py b/lms/urls.py
index 3ada605bbd83..25c5a04f78cd 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -344,7 +344,7 @@
         name='xblock_resource_url',
     ),
 
-    # New XBlock REST API, based on the openedx-core Content API
+    # New XBlock REST API, based on the openedx_content API
     path('', include(('openedx.core.djangoapps.xblock.rest_api.urls', 'openedx.core.djangoapps.xblock'),
                      namespace='xblock_api')),
 
diff --git a/openedx/core/djangoapps/content/search/documents.py b/openedx/core/djangoapps/content/search/documents.py
index aabb6b82d918..4f10070b02b4 100644
--- a/openedx/core/djangoapps/content/search/documents.py
+++ b/openedx/core/djangoapps/content/search/documents.py
@@ -137,7 +137,7 @@ def meili_id_from_opaque_key(key: OpaqueKey) -> str:
     hyphens (-) and underscores (_). Since our opaque keys don't meet this
     requirement, we transform them to a similar slug ID string that does.
 
-    In the future, with openedx-core's data models in place for courseware,
+    In the future, with openedx_content's data models in place for courseware,
     we could use PublishableEntity's primary key / UUID instead.
     """
     # The slugified key _may_ not be unique so we append a hashed string to make it unique:
@@ -232,7 +232,9 @@ class implementation returns only:
     if hasattr(block, "edited_on"):
         block_data[Fields.modified] = block.edited_on.timestamp()
     # Get the breadcrumbs (course, section, subsection, etc.):
-    if block.usage_key.context_key.is_course:  # Getting parent is not yet implemented in openedx-core (for libraries).
+    # TODO: Implement this for library items too. Libraries didn't support hierarchy at the time
+    #       this code was originally written.
+    if block.usage_key.context_key.is_course:
         cur_block = block
         while cur_block.parent:
             if not cur_block.has_cached_parent:
diff --git a/openedx/core/djangoapps/content_libraries/api/blocks.py b/openedx/core/djangoapps/content_libraries/api/blocks.py
index 6db7d5b0fb17..0711627c51b5 100644
--- a/openedx/core/djangoapps/content_libraries/api/blocks.py
+++ b/openedx/core/djangoapps/content_libraries/api/blocks.py
@@ -439,7 +439,7 @@ def _import_staged_block(
             # The ``data`` attribute is going to be None because the clipboard
             # is optimized to not do redundant file copying when copying/pasting
             # within the same course (where all the Files and Uploads are
-            # shared). openedx-core backed content Components will always store
+            # shared). openedx_content backed content Components will always store
             # a Component-local "copy" of the data, and rely on lower-level
             # deduplication to happen in the ``contents`` app.
             filename = staged_content_file_data.filename
@@ -459,14 +459,14 @@ def _import_staged_block(
             # Courses don't support having assets that are local to a specific
             # component, and instead store all their content together in a
             # shared Files and Uploads namespace. If we're pasting that into a
-            # openedx-core backed data model (v2 Libraries), then we want to
+            # openedx_content backed data model (v2 Libraries), then we want to
             # prepend "static/" to the filename. This will need to get updated
-            # when we start moving courses over to openedx-core, or if we start
+            # when we start moving courses over to openedx_content, or if we start
             # storing course component assets in sub-directories of Files and
             # Uploads.
             #
             # The reason we don't just search for a "static/" prefix is that
-            # openedx-core components can store other kinds of files if they
+            # openedx_content components can store other kinds of files if they
             # wish (though none currently do).
             source_assumes_global_assets = not isinstance(
                 source_context_key, LibraryLocatorV2
@@ -475,7 +475,7 @@ def _import_staged_block(
                 filename = f"static/{filename}"
 
             # Now construct the Core data models for it...
-            # TODO: more of this logic should be pushed down to openedx-core
+            # TODO: more of this logic should be pushed down to openedx_content
             media_type_str, _encoding = mimetypes.guess_type(filename)
             if not media_type_str:
                 media_type_str = "application/octet-stream"
@@ -687,7 +687,7 @@ def get_or_create_olx_media_type(block_type: str) -> MediaType:
     """
     Get or create a MediaType for the block type.
 
-    openedx-core stores all Content with a Media Type (a.k.a. MIME type). For
+    openedx_content stores all Content with a Media Type (a.k.a. MIME type). For
     OLX, we use the "application/vnd.*" convention, per RFC 6838.
     """
     return content_api.get_or_create_media_type(
diff --git a/openedx/core/djangoapps/content_libraries/api/courseware_import.py b/openedx/core/djangoapps/content_libraries/api/courseware_import.py
index 777327de7f92..943f809840c6 100644
--- a/openedx/core/djangoapps/content_libraries/api/courseware_import.py
+++ b/openedx/core/djangoapps/content_libraries/api/courseware_import.py
@@ -24,7 +24,7 @@
 from opaque_keys.edx.keys import UsageKey
 from edx_rest_api_client.client import OAuthAPIClient
 
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_content
 from xmodule.modulestore.django import modulestore
 
 from .. import tasks
@@ -209,7 +209,7 @@ def get_block_data(self, block_key):
         Get block OLX by serializing it from modulestore directly.
         """
         block = self.modulestore.get_item(block_key)
-        data = serialize_modulestore_block_for_openedx_core(block)
+        data = serialize_modulestore_block_for_openedx_content(block)
         return {'olx': data.olx_str,
                 'static_files': {s.name: s for s in data.static_files}}
 
diff --git a/openedx/core/djangoapps/content_libraries/api/libraries.py b/openedx/core/djangoapps/content_libraries/api/libraries.py
index 3e6a09b9192d..339e2b7685d0 100644
--- a/openedx/core/djangoapps/content_libraries/api/libraries.py
+++ b/openedx/core/djangoapps/content_libraries/api/libraries.py
@@ -303,7 +303,7 @@ def get_libraries_for_user(user, org=None, text_search=None, order=None) -> Quer
 
 def get_metadata(queryset: QuerySet[ContentLibrary], text_search: str | None = None) -> list[ContentLibraryMetadata]:
     """
-    Take a list of ContentLibrary objects and return metadata from openedx-core.
+    Take a list of ContentLibrary objects and return metadata from openedx_content.
     """
     if text_search:
         queryset = queryset.filter(org__short_name__icontains=text_search)
@@ -322,7 +322,7 @@ def get_metadata(queryset: QuerySet[ContentLibrary], text_search: str | None = N
             allow_public_read=lib.allow_public_read,
 
             # These are currently dummy values to maintain the REST API contract
-            # while we shift to openedx-core models.
+            # while we shift to openedx_content models.
             num_blocks=0,
             last_published=None,
             has_unpublished_changes=False,
@@ -374,7 +374,7 @@ def get_library(library_key: LibraryLocatorV2) -> ContentLibraryMetadata:
 
     # TODO: I'm doing this one to match already-existing behavior, but this is
     # something that we should remove. It exists to accomodate some complexities
-    # with how Blockstore staged changes, but openedx-core works differently,
+    # with how Blockstore staged changes, but openedx_content works differently,
     # and has_unpublished_changes should be sufficient.
     # Ref: https://github.com/openedx/edx-platform/issues/34283
     has_unpublished_deletes = (
diff --git a/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst b/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
index a0fa5e6eaeee..c8dbc58ceb6d 100644
--- a/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
+++ b/openedx/core/djangoapps/content_libraries/docs/decisions/0001-index-libraries-in-elasticsearch.rst
@@ -11,14 +11,14 @@ In Dec 2023, we decided to remove the code supporting this decision, because:
 * The index is disabled on edx.org, which will initially be the only user
   of Content Libraries V2.
 * As we migrate libraries from Modulestore to Blockstore and then from
-  Blockstore to openedx-core, the unused indexing code increases complexity
+  Blockstore to openedx_content, the unused indexing code increases complexity
   and decreases certainty.
 * With the decision to migrate from Blockstore-the-service to an in-process
-  storage backend (that is: Blockstore-the-app or openedx-core), it seems
+  storage backend (that is: Blockstore-the-app or openedx_content), it seems
   that we will be able to simply use Django ORM in order to filter/sort/search
   Content Library V2 metadata for the library listing page.
 * Searching Content Library V2 *block* content would still require indexing,
-  but we would rather implement that in openedx-core than use the current
+  but we would rather implement that in openedx_content than use the current
   implementation in the content_libraries app, which is untested, library-
   specific, and doesn't take into account library versioning. It always uses
   the latest draft, which is good for Library Authoring purposes, but not good for
diff --git a/openedx/core/djangoapps/content_libraries/library_context.py b/openedx/core/djangoapps/content_libraries/library_context.py
index 39265115ce71..1b693956ccd5 100644
--- a/openedx/core/djangoapps/content_libraries/library_context.py
+++ b/openedx/core/djangoapps/content_libraries/library_context.py
@@ -24,7 +24,7 @@ class LibraryContextImpl(LearningContext):
     """
     Implements content libraries as a learning context.
 
-    This is the *new* content libraries based on openedx-core, not the old content
+    This is the *new* content libraries based on openedx_content, not the old content
     libraries based on modulestore.
     """
 
diff --git a/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py b/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
index f27efb159f63..3f8270957f41 100644
--- a/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
+++ b/openedx/core/djangoapps/content_libraries/management/commands/content_libraries_import.py
@@ -89,7 +89,7 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         """
         Collect all blocks from a course that are "importable" and write them to the
-        a openedx-core library.
+        a openedx_content library.
         """
 
         # Search for the library.
diff --git a/openedx/core/djangoapps/content_libraries/models.py b/openedx/core/djangoapps/content_libraries/models.py
index 7798902b5c50..843b95cc2bdb 100644
--- a/openedx/core/djangoapps/content_libraries/models.py
+++ b/openedx/core/djangoapps/content_libraries/models.py
@@ -8,7 +8,7 @@
 LTI 1.3 Models
 ==============
 
-Content Libraries serves openedx-core-based through LTI 1.3 launches.
+Content Libraries serves openedx_content-based through LTI 1.3 launches.
 The interface supports resource link launches and grading services.  Two use
 cases justify the current data model to support LTI launches.  They are:
 
@@ -27,7 +27,7 @@
 The data model above is similar to the one provided by the current LTI 1.1
 implementation for modulestore and courseware content.  But, Content Libraries
 is orthogonal.  Its use-case is to offer standalone, embedded content from a
-specific backend (openedx-core).  As such, it decouples from LTI 1.1. and the
+specific backend (openedx_content).  As such, it decouples from LTI 1.1. and the
 logic assume no relationship or impact across the two applications.  The same
 reasoning applies to steps beyond the data model, such as at the XBlock
 runtime, authentication, and score handling, etc.
@@ -85,9 +85,9 @@ class ContentLibrary(models.Model):
     """
     A Content Library is a collection of content (XBlocks and/or static assets)
 
-    All actual content is stored in openedx-core, and any data that we'd want to
+    All actual content is stored in openedx_content, and any data that we'd want to
     transfer to another instance if this library were exported and then
-    re-imported on another Open edX instance should be kept in openedx-core. This
+    re-imported on another Open edX instance should be kept in openedx_content. This
     model in Studio should only be used to track settings specific to this Open
     edX instance, like who has permission to edit this content library.
 
diff --git a/openedx/core/djangoapps/content_libraries/permissions.py b/openedx/core/djangoapps/content_libraries/permissions.py
index 1009ec363a08..41ac240bab20 100644
--- a/openedx/core/djangoapps/content_libraries/permissions.py
+++ b/openedx/core/djangoapps/content_libraries/permissions.py
@@ -1,5 +1,5 @@
 """
-Permissions for Content Libraries (v2, openedx-core-based)
+Permissions for Content Libraries (v2, openedx_content-based)
 """
 from bridgekeeper import perms, rules
 from bridgekeeper.rules import Attribute, ManyRelation, Relation, blanket_rule, in_current_groups, Rule
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/blocks.py b/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
index fffe5f7c31fd..c4e065c3c8c5 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/blocks.py
@@ -194,7 +194,7 @@ def put(self, request, usage_key_str, file_path):
         file_wrapper = request.data['content']
         if file_wrapper.size > 20 * 1024 * 1024:  # > 20 MiB
             # TODO: This check was written when V2 Libraries were backed by the Blockstore micro-service.
-            #       Now that we're on openedx-core, do we still need it? Here's the original comment:
+            #       Now that we're on openedx_content, do we still need it? Here's the original comment:
             #         In the future, we need a way to use file_wrapper.chunks() to read
             #         the file in chunks and stream that to Blockstore, but Blockstore
             #         currently lacks an API for streaming file uploads.
@@ -406,7 +406,7 @@ def get_component_version_asset(request, component_version_uuid, asset_path):
     )
 
     # We already have logic for getting the correct content and generating the
-    # proper headers in openedx-core, but the response generated here is an
+    # proper headers in openedx_content, but the response generated here is an
     # X-Accel-Redirect and lacks the actual content. We eventually want to use
     # this response in conjunction with a media reverse proxy (Caddy or Nginx),
     # but in the short term we're just going to remove the redirect and stream
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/libraries.py b/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
index d832d6e93291..c407d64930dc 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/libraries.py
@@ -3,7 +3,7 @@
 Content Libraries Views
 =======================
 
-This module contains the REST APIs for openedx-core-based content libraries,
+This module contains the REST APIs for openedx_content-based content libraries,
 and LTI 1.3 views (though I'm not sure how functional the LTI piece of this is
 right now).
 
@@ -59,7 +59,7 @@
 
     Historical note: These views used to be wrapped with @atomic because we
     wanted to make all views that operated on Blockstore (the predecessor
-    to openedx-core) atomic:
+    to openedx_content) atomic:
         https://github.com/openedx/edx-platform/pull/30456
 """
 import itertools
diff --git a/openedx/core/djangoapps/content_libraries/rest_api/serializers.py b/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
index 3fb8b3dbb7d2..87a5dd3e3b6f 100644
--- a/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
+++ b/openedx/core/djangoapps/content_libraries/rest_api/serializers.py
@@ -198,7 +198,7 @@ class LibraryXBlockCreationSerializer(serializers.Serializer):
 
     block_type = serializers.CharField()
 
-    # TODO: Rename to ``block_id`` or ``slug``. The openedx-core XBlock runtime
+    # TODO: Rename to ``block_id`` or ``slug``. The openedx_content XBlock runtime
     # doesn't use definition_ids, but this field is really just about requesting
     # a specific block_id, e.g. the "best_tropical_vacation_spots" portion of a
     # problem with UsageKey:
diff --git a/openedx/core/djangoapps/content_libraries/tasks.py b/openedx/core/djangoapps/content_libraries/tasks.py
index f1b872abac9d..dfe1237b5613 100644
--- a/openedx/core/djangoapps/content_libraries/tasks.py
+++ b/openedx/core/djangoapps/content_libraries/tasks.py
@@ -4,11 +4,11 @@
 Architecture note:
 
     Several functions in this file manage the copying/updating of blocks in modulestore
-    and openedx-core. These operations should only be performed within the context of CMS.
+    and openedx_content. These operations should only be performed within the context of CMS.
     However, due to existing edx-platform code structure, we've had to define the functions
     in shared source tree (openedx/) and the tasks are registered in both LMS and CMS.
 
-    To ensure that we're not accidentally importing things from openedx-core in the LMS context,
+    To ensure that we're not accidentally importing things from openedx_content in the LMS context,
     we use ensure_cms throughout this module.
 
     A longer-term solution to this issue would be to move the content_libraries app to cms:
@@ -183,7 +183,7 @@ def send_events_after_revert(draft_change_log_id: int, library_key_str: str) ->
     try:
         draft_change_log = DraftChangeLog.objects.get(id=draft_change_log_id)
     except DraftChangeLog.DoesNotExist:
-        # When a revert operation is a no-op, openedx-core deletes the empty
+        # When a revert operation is a no-op, openedx_content deletes the empty
         # DraftChangeLog, so we'll assume that's what happened here.
         log.info(f"Library revert in {library_key_str} did not result in any changes.")
         return
diff --git a/openedx/core/djangoapps/content_libraries/tests/base.py b/openedx/core/djangoapps/content_libraries/tests/base.py
index 859cb39ecf79..04a5386c3127 100644
--- a/openedx/core/djangoapps/content_libraries/tests/base.py
+++ b/openedx/core/djangoapps/content_libraries/tests/base.py
@@ -1,5 +1,5 @@
 """
-Tests for openedx-core-based Content Libraries
+Tests for openedx_content-based Content Libraries
 """
 from contextlib import contextmanager
 import json
@@ -67,7 +67,7 @@
 @skip_unless_cms  # Content Libraries REST API is only available in Studio
 class ContentLibrariesRestApiTest(APITransactionTestCase):
     """
-    Base class for openedx-core-based Content Libraries test that use the REST API
+    Base class for openedx_content-based Content Libraries test that use the REST API
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_containers.py b/openedx/core/djangoapps/content_libraries/tests/test_containers.py
index 15db5583c60d..31ac143d0640 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_containers.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_containers.py
@@ -1,5 +1,5 @@
 """
-Tests for openedx-core-based Content Libraries
+Tests for openedx_content-based Content Libraries
 """
 from datetime import datetime, timezone
 import textwrap
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index 8fafc9fe9202..aba221dac821 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -1,5 +1,5 @@
 """
-Tests for openedx-core-based Content Libraries
+Tests for openedx_content-based Content Libraries
 """
 from datetime import datetime, timezone
 import os
@@ -51,7 +51,7 @@
 @ddt.ddt
 class ContentLibrariesTestCase(ContentLibrariesRestApiTest):
     """
-    General tests for openedx-core-based Content Libraries
+    General tests for openedx_content-based Content Libraries
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
@@ -357,7 +357,7 @@ def test_library_blocks(self):  # pylint: disable=too-many-statements
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem with unicode 🔥. It has "maximum attempts" set to **5**.</p>
-                <label>openedx-core is designed to store.</label>
+                <label>openedx_content is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -382,7 +382,7 @@ def test_library_blocks(self):  # pylint: disable=too-many-statements
         # Now view the XBlock's student_view (including draft changes):
         fragment = self._render_block_view(block_id, "student_view")
         assert 'resources' in fragment
-        assert 'openedx-core is designed to store.' in fragment['content']
+        assert 'openedx_content is designed to store.' in fragment['content']
 
         # Also call a handler to make sure that's working:
         handler_url = self._get_block_handler_url(block_id, "xmodule_handler") + "problem_get"
@@ -576,7 +576,7 @@ def test_library_permissions(self):  # pylint: disable=too-many-statements
 
         TODO: The asset permissions part of this test have been commented out
         for now. These should be re-enabled after we re-implement them over
-        openedx-core data models.
+        openedx_content data models.
         """
         # Create a few users to use for all of these tests:
         admin = UserFactory.create(username="Admin", email="admin@example.com", is_staff=True)
@@ -1678,7 +1678,7 @@ def test_authz_scope_with_combined_authz_and_legacy_permissions(self):
 
 @ddt.ddt
 class ContentLibraryXBlockValidationTest(APITestCase):
-    """Tests only focused on service validation, no openedx-core interactions here."""
+    """Tests only focused on service validation, no openedx_content interactions here."""
 
     @ddt.data(
         (URL_BLOCK_METADATA_URL, dict(block_key='totally_invalid_key')),
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py b/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
index 5f69a315efcb..2b57c59e7a35 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_course_to_library.py
@@ -1,5 +1,5 @@
 """
-Tests for Imports from Courses to openedx-core-based Content Libraries
+Tests for Imports from Courses to openedx_content-based Content Libraries
 """
 import ddt
 from opaque_keys.edx.locator import LibraryContainerLocator
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
index 93682a01f3c9..214c85e09af1 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_embed_block.py
@@ -24,7 +24,7 @@
 class LibrariesEmbedViewTestCase(ContentLibrariesRestApiTest):
     """
     Tests for embed_view and interacting with draft/published/past versions of
-    openedx-core-based XBlocks (in Content Libraries).
+    openedx_content-based XBlocks (in Content Libraries).
 
     These tests use the REST API, which in turn relies on the Python API.
     Some tests may use the python API directly if necessary to provide
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_events.py b/openedx/core/djangoapps/content_libraries/tests/test_events.py
index d0b91dc24860..dff2dbb47d53 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_events.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_events.py
@@ -1,5 +1,5 @@
 """
-Tests for openedx-core-based Content Libraries
+Tests for openedx_content-based Content Libraries
 """
 from opaque_keys.edx.locator import (
     LibraryCollectionLocator,
@@ -35,7 +35,7 @@
 @skip_unless_cms
 class ContentLibrariesEventsTestCase(ContentLibrariesRestApiTest):
     """
-    Event tests for openedx-core-based Content Libraries
+    Event tests for openedx_content-based Content Libraries
 
     These tests use the REST API, which in turn relies on the Python API.
     """
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index 0066e7698b94..653a62eb81cc 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -1,5 +1,5 @@
 """
-Test the openedx-core-based XBlock runtime and content libraries together.
+Test the openedx_content-based XBlock runtime and content libraries together.
 """
 import json
 
@@ -64,7 +64,7 @@ def setUp(self):
 @skip_unless_cms
 class ContentLibraryOlxTests(ContentLibraryContentTestMixin, TestCase):
     """
-    Basic test of the openedx-core-based XBlock serialization-deserialization, using XBlocks in a content library.
+    Basic test of the openedx_content-based XBlock serialization-deserialization, using XBlocks in a content library.
     """
 
     def test_html_round_trip(self):
@@ -149,7 +149,7 @@ def test_html_round_trip(self):
 
 class ContentLibraryRuntimeTests(ContentLibraryContentTestMixin, TestCase):
     """
-    Basic tests of the openedx-core-based XBlock runtime using XBlocks in a
+    Basic tests of the openedx_content-based XBlock runtime using XBlocks in a
     content library.
     """
     def test_dndv2_sets_translator(self):
@@ -180,7 +180,7 @@ def test_xblock_metadata(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>openedx-core is designed to store.</label>
+                <label>openedx_content is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -471,7 +471,7 @@ def test_scores_persisted(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>openedx-core is designed to store.</label>
+                <label>openedx_content is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
@@ -543,7 +543,7 @@ def test_i18n(self):
         <problem display_name="New Multi Choice Question" max_attempts="5">
             <multiplechoiceresponse>
                 <p>This is a normal capa problem. It has "maximum attempts" set to **5**.</p>
-                <label>openedx-core is designed to store.</label>
+                <label>openedx_content is designed to store.</label>
                 <choicegroup type="MultipleChoice">
                     <choice correct="false">XBlock metadata only</choice>
                     <choice correct="true">XBlock data/metadata and associated static asset files</choice>
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
index 3036a0ae174f..c563db4d8697 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_static_assets.py
@@ -1,5 +1,5 @@
 """
-Tests for static asset files in openedx-core-based Content Libraries
+Tests for static asset files in openedx_content-based Content Libraries
 """
 from uuid import UUID
 
@@ -31,7 +31,7 @@
 @skip_unless_cms
 class ContentLibrariesStaticAssetsTest(ContentLibrariesRestApiTest):
     """
-    Tests for static asset files in openedx-core-based Content Libraries
+    Tests for static asset files in openedx_content-based Content Libraries
     """
 
     def test_asset_filenames(self):
@@ -72,7 +72,7 @@ def test_asset_filenames(self):
 
     def test_video_transcripts(self):
         """
-        Test that video blocks can read transcript files out of openedx-core.
+        Test that video blocks can read transcript files out of openedx_content.
         """
         library = self._create_library(slug="transcript-test-lib", title="Transcripts Test Library")
         block = self._add_block_to_library(library["id"], "video", "video1")
@@ -111,7 +111,7 @@ def check_download():
         check_sjson()
         check_download()
         # Publish the OLX and the transcript file, since published data gets
-        # served differently by openedx-core and we should test that too.
+        # served differently by openedx_content and we should test that too.
         self._commit_library_changes(library["id"])
         check_sjson()
         check_download()
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
index e7695a7c293a..c41b76bb60a6 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_views_lti.py
@@ -85,5 +85,5 @@ class LibraryBlockLtiUrlViewTest(
     ContentLibrariesRestApiTest,
 ):
     """
-    Test generating LTI URL for a block in a library, using the installed openedx-core app.
+    Test generating LTI URL for a block in a library, using the installed openedx_content app.
     """
diff --git a/openedx/core/djangoapps/content_staging/README.rst b/openedx/core/djangoapps/content_staging/README.rst
index ab605c4d70ae..5960ee6a1f25 100644
--- a/openedx/core/djangoapps/content_staging/README.rst
+++ b/openedx/core/djangoapps/content_staging/README.rst
@@ -17,7 +17,7 @@ As this app is designed only for ephemeral use cases, API consumers should not
 expect that staged content will be stored for longer than 24 hours.
 
 This app is part of the CMS and is not intended to work with the LMS. It may be
-moved from the CMS into the future openedx-core project.
+moved from the CMS into the future openedx_content project.
 
 ---------------
 Clipboard Usage
diff --git a/openedx/core/djangoapps/olx_rest_api/views.py b/openedx/core/djangoapps/olx_rest_api/views.py
index b326cbd9109a..6e86208a4853 100644
--- a/openedx/core/djangoapps/olx_rest_api/views.py
+++ b/openedx/core/djangoapps/olx_rest_api/views.py
@@ -13,7 +13,7 @@
 from openedx.core.lib.api.view_utils import view_auth_classes
 from xmodule.modulestore.django import modulestore
 
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_content
 
 
 @api_view(['GET'])
@@ -22,7 +22,7 @@ def get_block_olx(request, usage_key_str):
     """
     Given a modulestore XBlock usage ID (block-v1:...), get its OLX and a list
     of any static asset files it uses.
-    (There are other APIs for getting the OLX of openedx-core XBlocks.)
+    (There are other APIs for getting the OLX of openedx_content XBlocks.)
     """
     # Parse the usage key:
     try:
@@ -48,7 +48,7 @@ def serialize_block(block_key):
             return
 
         block = modulestore().get_item(block_key)
-        serialized_blocks[block_key] = serialize_modulestore_block_for_openedx_core(block)
+        serialized_blocks[block_key] = serialize_modulestore_block_for_openedx_content(block)
 
         if block.has_children:
             for child_id in block.children:
@@ -103,7 +103,7 @@ def get_block_exportfs_file(request, usage_key_str, path):
         raise PermissionDenied("You must be a member of the course team in Studio to export OLX using this API.")
 
     block = modulestore().get_item(usage_key)
-    serialized = serialize_modulestore_block_for_openedx_core(block)
+    serialized = serialize_modulestore_block_for_openedx_content(block)
     static_file = None
     for f in serialized.static_files:
         if f.name == path:
diff --git a/openedx/core/djangoapps/video_config/services.py b/openedx/core/djangoapps/video_config/services.py
index 996d4ef93b56..ec55ac9d1b60 100644
--- a/openedx/core/djangoapps/video_config/services.py
+++ b/openedx/core/djangoapps/video_config/services.py
@@ -231,7 +231,7 @@ def upload_transcript(
         is_library = isinstance(video_block.usage_key.context_key, LibraryLocatorV2)
         content: bytes = transcript_file.read()
         if is_library:
-            # Save transcript as static asset in openedx-core if is a library component
+            # Save transcript as static asset in openedx_content if is a library component
             filename = f'static/transcript-{new_language_code}.srt'
             add_library_block_static_asset_file(video_block.usage_key, filename, content)
         else:
@@ -355,7 +355,7 @@ def handle_editor_saved(
 
 def _save_transcript_field(video_block):
     """
-    Hacky workaround to ensure that transcript field is saved for openedx-core video blocks.
+    Hacky workaround to ensure that transcript field is saved for openedx_content video blocks.
 
     It's not clear why this is necessary.
     """
diff --git a/openedx/core/djangoapps/video_config/transcripts_utils.py b/openedx/core/djangoapps/video_config/transcripts_utils.py
index 762b65b138eb..8946ccd212ef 100644
--- a/openedx/core/djangoapps/video_config/transcripts_utils.py
+++ b/openedx/core/djangoapps/video_config/transcripts_utils.py
@@ -850,7 +850,7 @@ def get_transcript_for_video(video_location, subs_id, file_name, language):
     """
     Get video transcript from content store. This is a lower level function and is used by
     `get_transcript_from_contentstore`. Prefer that function instead where possible. If you
-    need to support getting transcripts from VAL or openedx-core as well, use the `get_transcript`
+    need to support getting transcripts from VAL or openedx_content as well, use the `get_transcript`
     function instead.
 
     NOTE: Transcripts can be searched from content store by two ways:
@@ -945,13 +945,13 @@ def build_components_import_path(usage_key, file_path):
     return f"components/{usage_key.block_type}/{usage_key.block_id}/{file_path}"
 
 
-def get_transcript_from_openedx_core(video_block, language, output_format, transcripts_info):
+def get_transcript_from_openedx_content(video_block, language, output_format, transcripts_info):
     """
-    Get video transcript from the openedx-core Content API.
+    Get video transcript from the openedx_content API.
 
     Limitation: This is only going to grab from the Draft version.
 
-    openedx-core models a VideoBlock's data in a more generic thing it calls a
+    openedx_content models a VideoBlock's data in a more generic thing it calls a
     Component. Each Component has its own virtual space for file-like data. The
     OLX for the VideoBlock itself is stored at the root of that space, as
     ``block.xml``. Static assets that are meant to be user-downloadable are
@@ -1015,7 +1015,7 @@ def get_transcript_from_openedx_core(video_block, language, output_format, trans
             f"transcript files, but we tried to look up {file_path} for {usage_key}"
         )
 
-    # TODO: There should be a openedx-core API call for this:
+    # TODO: There should be a openedx_content API call for this:
     try:
         content = (
             component_version
@@ -1074,8 +1074,8 @@ def get_transcript(video, lang=None, output_format=Transcript.SRT, youtube_id=No
         lang = video.get_default_transcript_language(transcripts_info)
 
     if isinstance(video.scope_ids.usage_id, UsageKeyV2):
-        # This block is in openedx-core.
-        return get_transcript_from_openedx_core(video, lang, output_format, transcripts_info)
+        # This block is in openedx_content.
+        return get_transcript_from_openedx_content(video, lang, output_format, transcripts_info)
 
     try:
         edx_video_id = clean_video_id(video.edx_video_id)
diff --git a/openedx/core/djangoapps/xblock/README.rst b/openedx/core/djangoapps/xblock/README.rst
index 0ff9f612714e..a5d755af683c 100644
--- a/openedx/core/djangoapps/xblock/README.rst
+++ b/openedx/core/djangoapps/xblock/README.rst
@@ -1,5 +1,5 @@
 This README was written back when the new runtime was backed by Blockstore.
-Now that the runtime is backed by openedx-core, this README is out of date.
+Now that the runtime is backed by openedx_content, this README is out of date.
 We need to audit and update it as part of
 `this task <https://github.com/openedx/edx-platform/issues/34283>`_.
 
diff --git a/openedx/core/djangoapps/xblock/api.py b/openedx/core/djangoapps/xblock/api.py
index 66b553ed15c8..2cfa517712c9 100644
--- a/openedx/core/djangoapps/xblock/api.py
+++ b/openedx/core/djangoapps/xblock/api.py
@@ -28,9 +28,9 @@
 from openedx.core.types import User as UserType
 from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
 from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
-from openedx.core.djangoapps.xblock.runtime.openedx_core_runtime import (
-    OpenedXCoreFieldData,
-    OpenedXCoreRuntime,
+from openedx.core.djangoapps.xblock.runtime.openedx_content_runtime import (
+    OpenedXContentFieldData,
+    OpenedXContentRuntime,
 )
 from .data import CheckPerm, LatestVersion
 from .rest_api.url_converters import VersionConverter
@@ -40,7 +40,7 @@
     get_auto_latest_version,
 )
 
-from .runtime.openedx_core_runtime import OpenedXCoreRuntime
+from .runtime.openedx_content_runtime import OpenedXContentRuntime
 
 # Made available as part of this package's public API:
 from openedx.core.djangoapps.xblock.learning_context import LearningContext
@@ -50,7 +50,7 @@
 log = logging.getLogger(__name__)
 
 
-def get_runtime(user: UserType | None) -> OpenedXCoreRuntime:
+def get_runtime(user: UserType | None) -> OpenedXContentRuntime:
     """
     Return a new XBlockRuntime.
 
@@ -62,9 +62,9 @@ def get_runtime(user: UserType | None) -> OpenedXCoreRuntime:
     params = get_xblock_app_config().get_runtime_params()
     params.update(
         handler_url=get_handler_url,
-        authored_data_store=OpenedXCoreFieldData(),
+        authored_data_store=OpenedXContentFieldData(),
     )
-    runtime = OpenedXCoreRuntime(user, **params)
+    runtime = OpenedXContentRuntime(user, **params)
 
     return runtime
 
@@ -219,7 +219,7 @@ def get_block_olx(
     version: int | LatestVersion = LatestVersion.AUTO
 ) -> str:
     """
-    Get the OLX source of the of the given openedx-core-backed XBlock and a version.
+    Get the OLX source of the of the given openedx_content-backed XBlock and a version.
     """
     component = get_component_from_usage_key(usage_key)
     version = get_auto_latest_version(version)
diff --git a/openedx/core/djangoapps/xblock/apps.py b/openedx/core/djangoapps/xblock/apps.py
index ab2008e3c9c0..e0fb3b81b18d 100644
--- a/openedx/core/djangoapps/xblock/apps.py
+++ b/openedx/core/djangoapps/xblock/apps.py
@@ -18,7 +18,7 @@ class XBlockAppConfig(AppConfig):
 
     def get_runtime_params(self):
         """
-        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
+        Get the OpenedXContentRuntime parameters appropriate for viewing and/or
         editing XBlock content.
         """
         raise NotImplementedError
@@ -45,7 +45,7 @@ class LmsXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
+        Get the OpenedXContentRuntime parameters appropriate for viewing and/or
         editing XBlock content in the LMS
         """
         return dict(
@@ -68,7 +68,7 @@ class StudioXBlockAppConfig(XBlockAppConfig):
 
     def get_runtime_params(self):
         """
-        Get the OpenedXCoreRuntime parameters appropriate for viewing and/or
+        Get the OpenedXContentRuntime parameters appropriate for viewing and/or
         editing XBlock content in Studio
         """
         return dict(
diff --git a/openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py b/openedx/core/djangoapps/xblock/runtime/openedx_content_runtime.py
similarity index 91%
rename from openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py
rename to openedx/core/djangoapps/xblock/runtime/openedx_content_runtime.py
index 85187090ba11..daaa060db5b8 100644
--- a/openedx/core/djangoapps/xblock/runtime/openedx_core_runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/openedx_content_runtime.py
@@ -1,5 +1,5 @@
 """
-openedx-core XBlock Runtime code
+openedx_content XBlock Runtime code
 """
 from __future__ import annotations
 
@@ -22,7 +22,7 @@
 from xblock.field_data import FieldData
 
 from openedx.core.djangoapps.xblock.api import get_xblock_app_config
-from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_core
+from openedx.core.lib.xblock_serializer.api import serialize_modulestore_block_for_openedx_content
 from openedx.core.lib.xblock_serializer.data import StaticFile
 from ..data import AuthoredDataMode, LatestVersion
 from ..utils import get_auto_latest_version
@@ -33,30 +33,30 @@
 log = logging.getLogger(__name__)
 
 
-class OpenedXCoreFieldData(FieldData):
+class OpenedXContentFieldData(FieldData):
     """
-    FieldData for the openedx-core XBlock Runtime
+    FieldData for the openedx_content XBlock Runtime
 
-    OpenedXCoreFieldData only supports the ``content`` and ``settings`` scopes.
+    OpenedXContentFieldData only supports the ``content`` and ``settings`` scopes.
     Any attempt to read or write fields with other scopes will raise a
     ``NotImplementedError``. This class does NOT support the parent and children
     scopes.
 
-    OpenedXCoreFieldData should only live for the duration of one request. The
-    interaction between OpenedXCoreRuntime and OpenedXCoreFieldData is
+    OpenedXContentFieldData should only live for the duration of one request. The
+    interaction between OpenedXContentRuntime and OpenedXContentFieldData is
     as follows:
 
-    1. OpenedXCoreRuntime knows how retrieve authored content data from
-       the Content API in openedx-core. This content is stored as
-       OLX, and OpenedXCoreRuntime won't know how to parse it into
+    1. OpenedXContentRuntime knows how retrieve authored content data from
+       the Content API in openedx_content. This content is stored as
+       OLX, and OpenedXContentRuntime won't know how to parse it into
        fields, since serialization logic can happen in the XBlock itself.
-    2. OpenedXCoreRuntime will then invoke the block to parse the OLX and
-       then force_save its field data into OpenedXCoreFieldData.
+    2. OpenedXContentRuntime will then invoke the block to parse the OLX and
+       then force_save its field data into OpenedXContentFieldData.
     3. After this point, various handler and API calls might alter fields for
        a given block using the XBlock.
-    4. The main thing that OpenedXCoreRuntime will want to know later on
+    4. The main thing that OpenedXContentRuntime will want to know later on
        is whether it needs to write any changes when its save_block method is
-       invoked. To support this, OpenedXCoreFieldData needs to track which
+       invoked. To support this, OpenedXContentFieldData needs to track which
        blocks have changes to any of their fields. See the marked_unchanged
        method docstring for more details.
     """
@@ -74,9 +74,9 @@ def mark_unchanged(self, block):
         Calling set or delete on a field always marks the block with that field
         as changed, by adding its usage key to self.changed. But set() is also
         called at the very beginning, when a block is first loaded from the
-        database by the OpenedXCoreRuntime's get_block call.
+        database by the OpenedXContentRuntime's get_block call.
 
-        This method exists so that OpenedXCoreRuntime can call it
+        This method exists so that OpenedXContentRuntime can call it
         whenever it has either just done a get_block operation (because those
         set() calls represent the already-persisted content state), or a
         save_block operation (since those changes will have been persisted).
@@ -153,14 +153,14 @@ def _check_field(self, block, name):
         if field.scope not in (Scope.content, Scope.settings):
             raise NotImplementedError(
                 f"Scope {field.scope} (field {name} of {block.scope_ids.usage_id}) "
-                "is unsupported. OpenedXCoreFieldData only supports the content"
+                "is unsupported. OpenedXContentFieldData only supports the content"
                 " and settings scopes."
             )
 
 
-class OpenedXCoreRuntime(XBlockRuntime):
+class OpenedXContentRuntime(XBlockRuntime):
     """
-    XBlock runtime that uses openedx-core APIs (not ModuleStore).
+    XBlock runtime that uses openedx_content APIs (not ModuleStore).
 
     The superclass is doing all the hard stuff. This class only only has to
     worry about the block storage, block serialization/de-serialization, and
@@ -169,11 +169,11 @@ class OpenedXCoreRuntime(XBlockRuntime):
 
     def get_block(self, usage_key, for_parent=None, *, version: int | LatestVersion = LatestVersion.AUTO):
         """
-        Fetch an XBlock from openedx-core data models.
+        Fetch an XBlock from openedx_content data models.
 
-        This method will find the OLX for the content in openedx-core, parse it
+        This method will find the OLX for the content in openedx_content, parse it
         into an XBlock (with mixins) instance, and properly initialize our
-        internal OpenedXCoreFieldData instance with the field values from the
+        internal OpenedXContentFieldData instance with the field values from the
         parsed OLX.
         """
         # We can do this more efficiently in a single query later, but for now
@@ -268,7 +268,7 @@ def get_block_assets(self, block, fetch_asset_data):
 
     def save_block(self, block):
         """
-        Save any pending field data values to openedx-core data models.
+        Save any pending field data values to openedx_content data models.
 
         This gets called by block.save() - do not call this directly.
         """
@@ -290,7 +290,7 @@ def save_block(self, block):
                 log.warning("User %s does not have permission to edit %s", self.user.username, block.scope_ids.usage_id)
                 raise RuntimeError("You do not have permission to edit this XBlock")
 
-        serialized = serialize_modulestore_block_for_openedx_core(block)
+        serialized = serialize_modulestore_block_for_openedx_content(block)
         now = datetime.now(tz=timezone.utc)
         usage_key = block.scope_ids.usage_id
         with atomic():
@@ -344,7 +344,7 @@ def _get_component_from_usage_key(self, usage_key):
 
     def get_component_version_from_block(self, block):
         """
-        Given an XBlock instance, return the openedx-core ComponentVersion.
+        Given an XBlock instance, return the openedx_content ComponentVersion.
 
         This relies on our runtime setting the _runtime_requested_version
         attribute on blocks that it fetches.
@@ -401,20 +401,20 @@ def _lookup_asset_url(self, block: XBlock, asset_path: str) -> str | None:
         leading "static/" part because it assumes that all files will exist in a
         shared, flat namespace (i.e. a course's Files and Uploads).
 
-        openedx-core treats assets differently. Each Component has its own,
+        openedx_content treats assets differently. Each Component has its own,
         isolated namespace for asset storage. Furthermore, that namespace
         contains content that are not meant to be downloadable, like the
         block.xml (the OLX of the Component). There may one day be other files
         that are not meant to be externally downloadable there as well, like
         Markdown or LaTeX source files or grader code.
 
-        By convention, the static assets that we store in openedx-core and are
+        By convention, the static assets that we store in openedx_content and are
         meant for download sit inside a static/ directory that is local to each
         Component (and actually separate for each Component Version).
 
         So the transformation looks like this:
 
-        1. The openedx-core ComponentVersion has an asset stored as
+        1. The openedx_content ComponentVersion has an asset stored as
            ``static/test.png`` in the database.
         2. The original OLX content we store references ``/static/test.png``,
            per OLX convention. Note the leading "/".
diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index 0366f903bfa8..e4354bceccf6 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -259,14 +259,14 @@ def applicable_aside_types(self, block: XBlock):
 
     def parse_xml_file(self, fileobj):
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with OpenedXCoreRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OpenedXContentRuntime")
 
     def add_node_as_child(self, block, node):
         """
         Called by XBlock.parse_xml to treat a child node as a child block.
         """
         # Deny access to the inherited method
-        raise NotImplementedError("XML Serialization is only supported with OpenedXCoreRuntime")
+        raise NotImplementedError("XML Serialization is only supported with OpenedXContentRuntime")
 
     def service(self, block: XBlock, service_name: str):
         """
@@ -301,7 +301,7 @@ def service(self, block: XBlock, service_name: str):
 
             return DjangoXBlockUserService(
                 self.user,
-                # The value should be updated to whether the user is staff in the context when openedx-core runtime
+                # The value should be updated to whether the user is staff in the context when openedx_content runtime
                 # adds support for courses.
                 user_is_staff=self.user.is_staff,  # type: ignore
                 anonymous_user_id=self.anonymous_student_id,
diff --git a/openedx/core/djangoapps/xblock/runtime/shims.py b/openedx/core/djangoapps/xblock/runtime/shims.py
index 88847146a887..01e64c3bc508 100644
--- a/openedx/core/djangoapps/xblock/runtime/shims.py
+++ b/openedx/core/djangoapps/xblock/runtime/shims.py
@@ -102,7 +102,7 @@ def get_python_lib_zip(self):
 
         Only used for capa problems.
         """
-        # TODO: load the python code from openedx-core. Ensure it's not publicly accessible.
+        # TODO: load the python code from openedx_content. Ensure it's not publicly accessible.
         return None
 
     @property
diff --git a/openedx/core/lib/xblock_serializer/api.py b/openedx/core/lib/xblock_serializer/api.py
index 7de37999d233..6d0c1f78397c 100644
--- a/openedx/core/lib/xblock_serializer/api.py
+++ b/openedx/core/lib/xblock_serializer/api.py
@@ -17,17 +17,17 @@ def serialize_xblock_to_olx(block):
     return XBlockSerializer(block)
 
 
-def serialize_modulestore_block_for_openedx_core(block):
+def serialize_modulestore_block_for_openedx_content(block):
     """
     This class will serialize an XBlock, producing:
-        (1) A new definition ID for use in openedx-core
+        (1) A new definition ID for use in openedx_content
         (2) an XML string defining the XBlock and referencing the IDs of its
             children using <xblock-include /> syntax (which doesn't actually
             contain the OLX of its children, just refers to them, so you have to
             separately serialize them.)
         (3) a list of any static files required by the XBlock and their URL
 
-    TODO: We should deprecate this in favor of a new openedx-core implementation.
+    TODO: We should deprecate this in favor of a new openedx_content implementation.
     We've left it as-is for now partly because there are bigger questions that
     we have around how we should rewrite this (e.g. are we going to
     remove <xblock-include>?).
diff --git a/openedx/core/lib/xblock_serializer/block_serializer.py b/openedx/core/lib/xblock_serializer/block_serializer.py
index 695dd5842f6b..117f584d598a 100644
--- a/openedx/core/lib/xblock_serializer/block_serializer.py
+++ b/openedx/core/lib/xblock_serializer/block_serializer.py
@@ -49,8 +49,7 @@ def __init__(self, block, write_url_name=True, fetch_asset_data=False, write_cop
         runtime_supports_explicit_assets = hasattr(block.runtime, 'get_block_assets')
         if runtime_supports_explicit_assets:
             # If a block supports explicitly tracked assets, things are simple.
-            # openedx-core backed content supports this, which currently means
-            # v2 Content Libraries.
+            # openedx_content (v2 Content Libraries) currently supports this.
             self.static_files.extend(
                 block.runtime.get_block_assets(block, fetch_asset_data)
             )
diff --git a/openedx/core/lib/xblock_serializer/test_api.py b/openedx/core/lib/xblock_serializer/test_api.py
index e8525685020f..752ea229761e 100644
--- a/openedx/core/lib/xblock_serializer/test_api.py
+++ b/openedx/core/lib/xblock_serializer/test_api.py
@@ -140,17 +140,17 @@ def test_html_with_static_asset(self):
             ),
         ])
 
-    def test_html_with_static_asset_openedx_core(self):
+    def test_html_with_static_asset_openedx_content(self):
         """
-        Test the openedx-core-specific serialization of an HTML block
+        Test the openedx_content-specific serialization of an HTML block
         """
         block_id = self.course.id.make_usage_key('html', 'just_img')  # see sample_courses.py
         html_block = modulestore().get_item(block_id)
         serialized = api.serialize_xblock_to_olx(html_block)
-        serialized_openedx_core = api.serialize_modulestore_block_for_openedx_core(html_block)
+        serialized_openedx_content = api.serialize_modulestore_block_for_openedx_content(html_block)
         self.assertXmlEqual(
-            serialized_openedx_core.olx_str,
-            # For openedx-core, OLX should never contain "url_name" as that ID
+            serialized_openedx_content.olx_str,
+            # For openedx_content, OLX should never contain "url_name" as that ID
             # is specified by the Component key:
             """
             <html display_name="Text"><![CDATA[
@@ -160,7 +160,7 @@ def test_html_with_static_asset_openedx_core(self):
         )
         self.assertIn("CDATA", serialized.olx_str)
         # Static files should be identical:
-        self.assertEqual(serialized.static_files, serialized_openedx_core.static_files)
+        self.assertEqual(serialized.static_files, serialized_openedx_content.static_files)
 
     def test_html_with_fields(self):
         """ Test an HTML Block with non-default fields like editor='raw' """
diff --git a/openedx/core/lib/xblock_serializer/utils.py b/openedx/core/lib/xblock_serializer/utils.py
index 765cddaa2b34..89d60926691c 100644
--- a/openedx/core/lib/xblock_serializer/utils.py
+++ b/openedx/core/lib/xblock_serializer/utils.py
@@ -236,7 +236,7 @@ def openedx_core_def_key_from_modulestore_usage_key(usage_key):
     usage key.
     So modulestore usage key
         block-v1:A+B+C+type@html+block@introduction
-    will become openedx-core definition key
+    will become openedx_content definition key
         html/introduction
     """
     block_type = usage_key.block_type
diff --git a/xmodule/README.rst b/xmodule/README.rst
index bcf5d4bc73fa..cb2f0ea99027 100644
--- a/xmodule/README.rst
+++ b/xmodule/README.rst
@@ -41,15 +41,16 @@ Direction
 Currently, this directory contains a lot of mission-critical functionality, so continued maintenance and simplification of it is important.
 Still, we aim to eventually dissolve the directory in favor of more focused & decoupled subsystems:
 
-* ModuleStore is superseded by the `Open edX Core`_ (a.k.a. ``openedx-core``) storage backend.
-* openedx-core-backed content is rendered by a new, simplified `edx-platform XBlock runtime`_.
-* Navigation, partitioning, and composition of learning content is being re-architected in the `openedx-core`_ library.
+* ModuleStore is superseded by the `openedx_content`_ storage backend.
+* Content within ``openedx_content`` is rendered by a new, simplified `openedx-platform XBlock runtime`_.
+* Navigation, partitioning, and composition of learning content is being re-architected in the `openedx-core`_ library,
+  which includes the implementations of ``openedx_content`` and ``openedx_tagging``.
 * All new XBlocks are implemented in separate repositories, such as `xblock-drag-and-drop-v2`_.
 
 To help with this direction, please **do not add new functionality to this directory**. If you feel that you need to add code to this directory, reach out on `the forums`_; it's likely that someone can help you find a different way to implement your change that will be more robust and architecturally sound!
 
-.. _Open edX Core: https://github.com/openedx/openedx-core/
-.. _edx-platform XBlock runtime: https://github.com/openedx/edx-platform/tree/master/openedx/core/djangoapps/xblock
+.. _openedx_content: https://github.com/openedx/openedx-core/tree/main/src/openedx_content
+.. _openedx-platform XBlock runtime: https://github.com/openedx/openedx-platform/tree/master/openedx/core/djangoapps/xblock
 .. _openedx-core: https://github.com/openedx/openedx-core
 .. _xblock-drag-and-drop-v2: https://github.com/openedx/xblock-drag-and-drop-v2
 .. _the forums: https://discuss.openedx.org
diff --git a/xmodule/html_block.py b/xmodule/html_block.py
index 9e1615afc05c..a11edddb508c 100644
--- a/xmodule/html_block.py
+++ b/xmodule/html_block.py
@@ -297,7 +297,7 @@ def load_definition(cls, xml_object, system, location, id_generator):  # lint-am
     @classmethod
     def parse_xml_new_runtime(cls, node, runtime, keys):
         """
-        Parse XML in the new openedx-core-based runtime. Since it doesn't yet
+        Parse XML in the new openedx_content-based runtime. Since it doesn't yet
         support loading separate .html files, the HTML data is assumed to be in
         a CDATA child or otherwise just inline in the OLX.
         """
diff --git a/xmodule/library_content_block.py b/xmodule/library_content_block.py
index 5fa80545f725..e4086bacb52d 100644
--- a/xmodule/library_content_block.py
+++ b/xmodule/library_content_block.py
@@ -3,7 +3,7 @@
 
 In Studio, it's called the "Randomized Content Module".
 
-In the long-term, this block is deprecated in favor of "v2" (openedx-core-backed) library references:
+In the long-term, this block is deprecated in favor of "v2" (openedx_content-backed) library references:
 https://github.com/openedx/edx-platform/issues/32457
 
 We need to retain backwards-compatibility, but please do not build any new features into this.
diff --git a/xmodule/library_tools.py b/xmodule/library_tools.py
index a1829812911b..eca227dd47f4 100644
--- a/xmodule/library_tools.py
+++ b/xmodule/library_tools.py
@@ -24,7 +24,7 @@ class LegacyLibraryToolsService:
     """
     Service for LegacyLibraryContentBlock.
 
-    Allows to interact with libraries in the modulestore and openedx-core.
+    Allows to interact with libraries in the modulestore and openedx_content.
 
     Should only be used in the CMS.
     """
diff --git a/xmodule/raw_block.py b/xmodule/raw_block.py
index 6dc9cc920c40..6ee1852a9a5a 100644
--- a/xmodule/raw_block.py
+++ b/xmodule/raw_block.py
@@ -66,7 +66,7 @@ def parse_xml_new_runtime(cls, node, runtime, keys):
         Interpret the parsed XML in `node`, creating a new instance of this
         module.
         """
-        # In the new/openedx-core-based runtime, XModule parsing (from
+        # In the new/openedx_content-based runtime, XModule parsing (from
         # XmlMixin) is disabled, so definition_from_xml will not be
         # called, and instead the "normal" XBlock parse_xml will be used.
         # However, it's not compatible with RawMixin, so we implement
diff --git a/xmodule/video_block/video_handlers.py b/xmodule/video_block/video_handlers.py
index 390c15e05dc6..f00f2e9f0330 100644
--- a/xmodule/video_block/video_handlers.py
+++ b/xmodule/video_block/video_handlers.py
@@ -357,7 +357,7 @@ def student_view_user_state(self, request, suffix=''):  # lint-amnesty, pylint:
     def yt_video_metadata(self, request, suffix=''):  # lint-amnesty, pylint: disable=unused-argument
         """
         Endpoint to get YouTube metadata.
-        This handler is only used in the openedx-core-based runtime. The old
+        This handler is only used in the openedx_content-based runtime. The old
         runtime uses a similar REST API that's not an XBlock handler.
         """
         from lms.djangoapps.courseware.views.views import load_metadata_from_youtube

From 54e2eae1d3f6042267fb8c478f3372d9f48d1b32 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 18 Feb 2026 17:03:35 -0500
Subject: [PATCH 4/5] docs: Note about merging runtimes

---
 openedx/core/djangoapps/xblock/runtime/runtime.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/openedx/core/djangoapps/xblock/runtime/runtime.py b/openedx/core/djangoapps/xblock/runtime/runtime.py
index e4354bceccf6..2a5f4baebdbb 100644
--- a/openedx/core/djangoapps/xblock/runtime/runtime.py
+++ b/openedx/core/djangoapps/xblock/runtime/runtime.py
@@ -85,6 +85,9 @@ class XBlockRuntime(RuntimeShim, Runtime):
     The main reason we cannot make the runtime a long-lived singleton is that
     the XBlock runtime API requires 'user_id' to be a property of the runtime,
     not an argument passed in when loading particular blocks.
+
+    TODO: This should probably be merged with OpenedXContentRuntime, its one and
+          only child class. See https://github.com/openedx/openedx-platform/issues/38021
     """
 
     # ** Do not add any XModule compatibility code to this class **

From 5099a35d872728d7ce132766cd66edb2e35e6a63 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kyle@axim.org>
Date: Wed, 18 Feb 2026 17:08:49 -0500
Subject: [PATCH 5/5] docs: Update a few more sneaky references to 'LC'

---
 cms/djangoapps/modulestore_migrator/data.py                   | 4 ++--
 cms/lib/xblock/upstream_sync.py                               | 2 +-
 cms/lib/xblock/upstream_sync_block.py                         | 4 ++--
 .../core/djangoapps/content_libraries/tests/test_runtime.py   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cms/djangoapps/modulestore_migrator/data.py b/cms/djangoapps/modulestore_migrator/data.py
index 0f8e5864b7e0..f2a9d725656c 100644
--- a/cms/djangoapps/modulestore_migrator/data.py
+++ b/cms/djangoapps/modulestore_migrator/data.py
@@ -116,7 +116,7 @@ class ModulestoreBlockMigrationResult:
 @dataclass(frozen=True)
 class ModulestoreBlockMigrationSuccess(ModulestoreBlockMigrationResult):
     """
-    Info on a modulestore block which has been successfully migrated into an LC entity
+    Info on a modulestore block which has been successfully migrated to an openedx_content entity
     """
     target_entity_pk: int
     target_key: LibraryUsageLocatorV2 | LibraryContainerLocator
@@ -128,7 +128,7 @@ class ModulestoreBlockMigrationSuccess(ModulestoreBlockMigrationResult):
 @dataclass(frozen=True)
 class ModulestoreBlockMigrationFailure(ModulestoreBlockMigrationResult):
     """
-    Info on a modulestore block which failed to be migrated into LC
+    Info on a modulestore block which failed to be migrated into openedx_content
     """
     unsupported_reason: str
     is_failed: t.ClassVar[bool] = True
diff --git a/cms/lib/xblock/upstream_sync.py b/cms/lib/xblock/upstream_sync.py
index 2af27b020efb..729d18bf5bc7 100644
--- a/cms/lib/xblock/upstream_sync.py
+++ b/cms/lib/xblock/upstream_sync.py
@@ -245,7 +245,7 @@ def get_for_block(cls, downstream: XBlock) -> t.Self:
         Get info on a downstream block's relationship with its linked upstream
         content (without actually loading the content).
 
-        Currently, the only supported upstreams are LC-backed Library Components
+        Currently, the only supported upstreams are openedx_content-backed Components
         (XBlocks) or Containers. This may change in the future (see module
         docstring).
 
diff --git a/cms/lib/xblock/upstream_sync_block.py b/cms/lib/xblock/upstream_sync_block.py
index 4ac7f11bd188..6b5d14ffc5ed 100644
--- a/cms/lib/xblock/upstream_sync_block.py
+++ b/cms/lib/xblock/upstream_sync_block.py
@@ -90,8 +90,8 @@ def _load_upstream_block(downstream: XBlock, user: User) -> XBlock:
     """
     Load the upstream metadata and content for a downstream block.
 
-    Assumes that the upstream content is an XBlock in an LC-backed content libraries. This assumption may need to be
-    relaxed in the future (see module docstring).
+    Assumes that the upstream content is an XBlock in an openedx_content-backed
+    library. This assumption may need to be relaxed in the future (see module docstring).
 
     If `downstream` lacks a valid+supported upstream link, this raises an UpstreamLinkException.
     """
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
index 653a62eb81cc..a4b98c09b133 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_runtime.py
@@ -116,7 +116,7 @@ def test_html_round_trip(self):
             f'<html url_name="roundtrip" display_name="Round Trip Test HTML Block"><![CDATA[{block_content}]]></html>\n'
         )
 
-        # Save the block to LC, and re-load it.
+        # Save the block to openedx_content, and re-load it.
         library_api.set_library_block_olx(usage_key, olx_1)
         library_api.publish_changes(self.library.key)
         block_saved_1 = xblock_api.load_block(usage_key, self.staff_user)
@@ -131,7 +131,7 @@ def test_html_round_trip(self):
         ).olx_str
         assert olx_2 == canonical_olx
 
-        # Now, save that OLX back to LC, and re-load it again.
+        # Now, save that OLX back to openedx_content, and re-load it again.
         library_api.set_library_block_olx(usage_key, olx_2)
         library_api.publish_changes(self.library.key)
         block_saved_2 = xblock_api.load_block(usage_key, self.staff_user)