diff --git a/src/typeagent/emails/email_message.py b/src/typeagent/emails/email_message.py
index 97fd86e..0a469f4 100644
--- a/src/typeagent/emails/email_message.py
+++ b/src/typeagent/emails/email_message.py
@@ -7,7 +7,7 @@
 from pydantic import Field
 from pydantic.dataclasses import dataclass as pydantic_dataclass
 
-from ..knowpro import kplib
+from ..knowpro import knowledge_schema as kplib
 from ..knowpro.field_helpers import CamelCaseField
 from ..knowpro.interfaces import IKnowledgeSource, IMessage, IMessageMetadata
 
diff --git a/src/typeagent/knowpro/answers.py b/src/typeagent/knowpro/answers.py
index d1b87a3..2c30050 100644
--- a/src/typeagent/knowpro/answers.py
+++ b/src/typeagent/knowpro/answers.py
@@ -32,7 +32,7 @@
     TextRange,
     Topic,
 )
-from .kplib import ConcreteEntity, Facet
+from .knowledge_schema import ConcreteEntity, Facet
 from .search import ConversationSearchResult
 
 
diff --git a/src/typeagent/knowpro/conversation_base.py b/src/typeagent/knowpro/conversation_base.py
index 07ea155..4b72ac9 100644
--- a/src/typeagent/knowpro/conversation_base.py
+++ b/src/typeagent/knowpro/conversation_base.py
@@ -13,7 +13,7 @@
     answer_response_schema,
     answers,
     convknowledge,
-    kplib,
+    knowledge_schema as kplib,
     search_query_schema,
     searchlang,
     secindex,
diff --git a/src/typeagent/knowpro/convknowledge.py b/src/typeagent/knowpro/convknowledge.py
index fe1d5f5..49fde42 100644
--- a/src/typeagent/knowpro/convknowledge.py
+++ b/src/typeagent/knowpro/convknowledge.py
@@ -5,7 +5,7 @@
 
 import typechat
 
-from . import kplib
+from . import knowledge_schema as kplib
 from ..aitools.model_adapters import create_chat_model
 
 
diff --git a/src/typeagent/knowpro/interfaces_core.py b/src/typeagent/knowpro/interfaces_core.py
index 4e53f27..105e45b 100644
--- a/src/typeagent/knowpro/interfaces_core.py
+++ b/src/typeagent/knowpro/interfaces_core.py
@@ -19,7 +19,7 @@
 from pydantic.dataclasses import dataclass
 import typechat
 
-from . import kplib
+from . import knowledge_schema as kplib
 from .field_helpers import CamelCaseField
 
 __all__ = [
diff --git a/src/typeagent/knowpro/knowledge.py b/src/typeagent/knowpro/knowledge.py
index 60ce302..0e2a076 100644
--- a/src/typeagent/knowpro/knowledge.py
+++ b/src/typeagent/knowpro/knowledge.py
@@ -7,7 +7,7 @@
 
 from typechat import Result, TypeChatLanguageModel
 
-from . import convknowledge, kplib
+from . import convknowledge, knowledge_schema as kplib
 from ..aitools import model_adapters
 from .interfaces import IKnowledgeExtractor
 
diff --git a/src/typeagent/knowpro/kplib.py b/src/typeagent/knowpro/knowledge_schema.py
similarity index 100%
rename from src/typeagent/knowpro/kplib.py
rename to src/typeagent/knowpro/knowledge_schema.py
diff --git a/src/typeagent/knowpro/query.py b/src/typeagent/knowpro/query.py
index 0bedf95..44fa06e 100644
--- a/src/typeagent/knowpro/query.py
+++ b/src/typeagent/knowpro/query.py
@@ -44,7 +44,7 @@
     TextRange,
     Thread,
 )
-from .kplib import ConcreteEntity
+from .knowledge_schema import ConcreteEntity
 from .utils import aenumerate
 
 # TODO: Move to compilelib.py
diff --git a/src/typeagent/knowpro/search.py b/src/typeagent/knowpro/search.py
index 9641590..bfc9445 100644
--- a/src/typeagent/knowpro/search.py
+++ b/src/typeagent/knowpro/search.py
@@ -24,7 +24,7 @@
     Term,
     WhenFilter,
 )
-from .kplib import ConcreteEntity
+from .knowledge_schema import ConcreteEntity
 from .query import (
     BooleanOp,
     CompiledSearchTerm,
diff --git a/src/typeagent/knowpro/serialization.py b/src/typeagent/knowpro/serialization.py
index cbbe7b7..60cad6b 100644
--- a/src/typeagent/knowpro/serialization.py
+++ b/src/typeagent/knowpro/serialization.py
@@ -24,7 +24,7 @@
 
 from pydantic.alias_generators import to_camel
 
-from . import kplib
+from . import knowledge_schema as kplib
 from ..aitools.embeddings import NormalizedEmbeddings
 from .interfaces import ConversationDataWithIndexes, SearchTermGroupTypes, Tag, Topic
 
diff --git a/src/typeagent/knowpro/universal_message.py b/src/typeagent/knowpro/universal_message.py
index fe4ebfa..01abfdf 100644
--- a/src/typeagent/knowpro/universal_message.py
+++ b/src/typeagent/knowpro/universal_message.py
@@ -8,7 +8,7 @@
 
 from pydantic import AliasChoices, Field
 
-from . import kplib
+from . import knowledge_schema as kplib
 from .dataclasses import dataclass as pydantic_dataclass
 from .field_helpers import CamelCaseField
 from .interfaces import IKnowledgeSource, IMessage, IMessageMetadata
diff --git a/src/typeagent/storage/memory/propindex.py b/src/typeagent/storage/memory/propindex.py
index c35d140..acc7b89 100644
--- a/src/typeagent/storage/memory/propindex.py
+++ b/src/typeagent/storage/memory/propindex.py
@@ -4,7 +4,7 @@
 import enum
 from typing import assert_never
 
-from ...knowpro import kplib
+from ...knowpro import knowledge_schema as kplib
 from ...knowpro.collections import TextRangesInScope
 from ...knowpro.interfaces import (
     IConversation,
diff --git a/src/typeagent/storage/memory/semrefindex.py b/src/typeagent/storage/memory/semrefindex.py
index ec44c87..6c42022 100644
--- a/src/typeagent/storage/memory/semrefindex.py
+++ b/src/typeagent/storage/memory/semrefindex.py
@@ -7,7 +7,7 @@
 
 from typechat import Failure
 
-from ...knowpro import convknowledge, kplib, secindex
+from ...knowpro import convknowledge, knowledge_schema as kplib, secindex
 from ...knowpro.convsettings import ConversationSettings, SemanticRefIndexSettings
 from ...knowpro.interfaces import (  # Interfaces.; Other imports.
     IConversation,
diff --git a/tests/conftest.py b/tests/conftest.py
index c4de6d4..dae619c 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -32,7 +32,7 @@
     SemanticRef,
     TextLocation,
 )
-from typeagent.knowpro.kplib import KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import KnowledgeResponse
 from typeagent.knowpro.secindex import ConversationSecondaryIndexes
 from typeagent.storage import SqliteStorageProvider
 from typeagent.storage.memory import MemoryStorageProvider
diff --git a/tests/test_answers.py b/tests/test_answers.py
index a8fc0ce..888924b 100644
--- a/tests/test_answers.py
+++ b/tests/test_answers.py
@@ -14,7 +14,7 @@
     text_range_from_message_range,
 )
 from typeagent.knowpro.interfaces import TextLocation, TextRange
-from typeagent.knowpro.kplib import Facet
+from typeagent.knowpro.knowledge_schema import Facet
 
 from conftest import FakeMessage, FakeMessageCollection
 
diff --git a/tests/test_collections.py b/tests/test_collections.py
index ca6e14e..0f61e18 100644
--- a/tests/test_collections.py
+++ b/tests/test_collections.py
@@ -25,7 +25,7 @@
     TextLocation,
     TextRange,
 )
-from typeagent.knowpro.kplib import Action, ConcreteEntity
+from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity
 from typeagent.storage.memory.collections import MemorySemanticRefCollection
 
 
diff --git a/tests/test_conversation_metadata.py b/tests/test_conversation_metadata.py
index 37a194a..452288b 100644
--- a/tests/test_conversation_metadata.py
+++ b/tests/test_conversation_metadata.py
@@ -25,7 +25,7 @@
     RelatedTermIndexSettings,
 )
 from typeagent.knowpro.interfaces import ConversationMetadata, IMessage
-from typeagent.knowpro.kplib import KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import KnowledgeResponse
 from typeagent.storage.sqlite.provider import SqliteStorageProvider
 from typeagent.transcripts.transcript import (
     Transcript,
diff --git a/tests/test_interfaces.py b/tests/test_interfaces.py
index d4f6b9f..160bbdc 100644
--- a/tests/test_interfaces.py
+++ b/tests/test_interfaces.py
@@ -18,7 +18,7 @@
     Thread,
     WhenFilter,
 )
-from typeagent.knowpro.kplib import ConcreteEntity
+from typeagent.knowpro.knowledge_schema import ConcreteEntity
 
 
 def test_text_location_serialization():
diff --git a/tests/test_knowledge.py b/tests/test_knowledge.py
index d4f46fd..822dc48 100644
--- a/tests/test_knowledge.py
+++ b/tests/test_knowledge.py
@@ -5,7 +5,7 @@
 
 from typechat import Failure, Result, Success
 
-from typeagent.knowpro import convknowledge, kplib
+from typeagent.knowpro import convknowledge, knowledge_schema as kplib
 from typeagent.knowpro.knowledge import (
     create_knowledge_extractor,
     extract_knowledge_from_text,
@@ -13,7 +13,7 @@
     merge_concrete_entities,
     merge_topics,
 )
-from typeagent.knowpro.kplib import ConcreteEntity, Facet
+from typeagent.knowpro.knowledge_schema import ConcreteEntity, Facet
 
 
 class MockKnowledgeExtractor:
diff --git a/tests/test_kplib.py b/tests/test_kplib.py
index 0a5edf6..7b5247d 100644
--- a/tests/test_kplib.py
+++ b/tests/test_kplib.py
@@ -1,7 +1,7 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-from typeagent.knowpro.kplib import (
+from typeagent.knowpro.knowledge_schema import (
     Action,
     ActionParam,
     ConcreteEntity,
diff --git a/tests/test_property_index_population.py b/tests/test_property_index_population.py
index f6cc3ed..5a15835 100644
--- a/tests/test_property_index_population.py
+++ b/tests/test_property_index_population.py
@@ -12,7 +12,7 @@
 
 from typeagent.aitools.model_adapters import create_test_embedding_model
 from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
-from typeagent.knowpro import kplib
+from typeagent.knowpro import knowledge_schema as kplib
 from typeagent.knowpro.convsettings import (
     MessageTextIndexSettings,
     RelatedTermIndexSettings,
diff --git a/tests/test_propindex.py b/tests/test_propindex.py
index 5ffd978..8f0a99d 100644
--- a/tests/test_propindex.py
+++ b/tests/test_propindex.py
@@ -5,7 +5,7 @@
 
 from typeagent.knowpro.collections import TextRangeCollection, TextRangesInScope
 from typeagent.knowpro.interfaces import SemanticRef, Tag, TextLocation, TextRange
-from typeagent.knowpro.kplib import Action, ConcreteEntity, Facet
+from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity, Facet
 from typeagent.storage.memory import MemorySemanticRefCollection
 from typeagent.storage.memory.propindex import (
     add_action_properties_to_index,
diff --git a/tests/test_query.py b/tests/test_query.py
index 4546e64..c643166 100644
--- a/tests/test_query.py
+++ b/tests/test_query.py
@@ -646,7 +646,7 @@ async def test_lookup_knowledge_type():
         TextRange,
         Topic,
     )
-    from typeagent.knowpro.kplib import ConcreteEntity
+    from typeagent.knowpro.knowledge_schema import ConcreteEntity
     from typeagent.knowpro.query import lookup_knowledge_type
 
     # Create valid TextRange and knowledge objects
diff --git a/tests/test_related_terms_fast.py b/tests/test_related_terms_fast.py
index fbcf60c..43ffa7c 100644
--- a/tests/test_related_terms_fast.py
+++ b/tests/test_related_terms_fast.py
@@ -12,7 +12,7 @@
 from typeagent.aitools.model_adapters import create_test_embedding_model
 from typeagent.knowpro.convsettings import ConversationSettings
 from typeagent.knowpro.interfaces import SemanticRef, TextLocation, TextRange
-from typeagent.knowpro.kplib import ConcreteEntity
+from typeagent.knowpro.knowledge_schema import ConcreteEntity
 from typeagent.podcasts.podcast import Podcast, PodcastMessage, PodcastMessageMeta
 from typeagent.storage import SqliteStorageProvider
 
diff --git a/tests/test_related_terms_index_population.py b/tests/test_related_terms_index_population.py
index 9de6f01..bf40722 100644
--- a/tests/test_related_terms_index_population.py
+++ b/tests/test_related_terms_index_population.py
@@ -12,7 +12,7 @@
 
 from typeagent.aitools.model_adapters import create_test_embedding_model
 from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
-from typeagent.knowpro import kplib
+from typeagent.knowpro import knowledge_schema as kplib
 from typeagent.knowpro.convsettings import (
     MessageTextIndexSettings,
     RelatedTermIndexSettings,
diff --git a/tests/test_reltermsindex.py b/tests/test_reltermsindex.py
index 47d21d5..2075208 100644
--- a/tests/test_reltermsindex.py
+++ b/tests/test_reltermsindex.py
@@ -15,7 +15,7 @@
     RelatedTermIndexSettings,
 )
 from typeagent.knowpro.interfaces import IMessage, ITermToRelatedTermsIndex, Term
-from typeagent.knowpro.kplib import KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import KnowledgeResponse
 from typeagent.knowpro.query import CompiledSearchTerm, CompiledTermGroup
 from typeagent.storage import SqliteStorageProvider
 from typeagent.storage.memory import MemoryStorageProvider
diff --git a/tests/test_semrefindex.py b/tests/test_semrefindex.py
index 20dad6b..199d602 100644
--- a/tests/test_semrefindex.py
+++ b/tests/test_semrefindex.py
@@ -20,7 +20,7 @@
     ITermToSemanticRefIndex,
     Topic,
 )
-from typeagent.knowpro.kplib import Action, ConcreteEntity, Facet, KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import Action, ConcreteEntity, Facet, KnowledgeResponse
 from typeagent.storage import SqliteStorageProvider
 from typeagent.storage.memory import MemoryStorageProvider
 from typeagent.storage.memory.semrefindex import (
diff --git a/tests/test_serialization.py b/tests/test_serialization.py
index adb46dd..eec08fd 100644
--- a/tests/test_serialization.py
+++ b/tests/test_serialization.py
@@ -13,7 +13,7 @@
     TermsToRelatedTermsIndexData,
     TextToTextLocationIndexData,
 )
-from typeagent.knowpro.kplib import ConcreteEntity, Quantity
+from typeagent.knowpro.knowledge_schema import ConcreteEntity, Quantity
 from typeagent.knowpro.serialization import (
     create_file_header,
     DeserializationError,
diff --git a/tests/test_sqlitestore.py b/tests/test_sqlitestore.py
index 704ab0b..27a522d 100644
--- a/tests/test_sqlitestore.py
+++ b/tests/test_sqlitestore.py
@@ -23,7 +23,7 @@
     TextRange,
     Topic,
 )
-from typeagent.knowpro.kplib import KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import KnowledgeResponse
 from typeagent.storage import SqliteStorageProvider
 
 
diff --git a/tests/test_storage_providers_unified.py b/tests/test_storage_providers_unified.py
index d0ecb9c..179b1a7 100644
--- a/tests/test_storage_providers_unified.py
+++ b/tests/test_storage_providers_unified.py
@@ -20,7 +20,7 @@
 
 from typeagent.aitools.embeddings import IEmbeddingModel
 from typeagent.aitools.vectorbase import TextEmbeddingIndexSettings
-from typeagent.knowpro import kplib
+from typeagent.knowpro import knowledge_schema as kplib
 from typeagent.knowpro.convsettings import (
     MessageTextIndexSettings,
     RelatedTermIndexSettings,
@@ -36,7 +36,7 @@
     TextRange,
     Topic,
 )
-from typeagent.knowpro.kplib import KnowledgeResponse
+from typeagent.knowpro.knowledge_schema import KnowledgeResponse
 from typeagent.storage import SqliteStorageProvider
 from typeagent.storage.memory import MemoryStorageProvider
 
diff --git a/tools/query.py b/tools/query.py
index b3a3509..c052445 100644
--- a/tools/query.py
+++ b/tools/query.py
@@ -36,7 +36,7 @@
 from typeagent.knowpro import (
     answer_response_schema,
     answers,
-    kplib,
+    knowledge_schema as kplib,
     query,
     search,
     search_query_schema,