diff --git a/CoreStoreTests/BridgingTests.m b/CoreStoreTests/BridgingTests.m
index 5ae9800..4369050 100644
--- a/CoreStoreTests/BridgingTests.m
+++ b/CoreStoreTests/BridgingTests.m
@@ -45,26 +45,26 @@
 - (void)test_ThatFromClauses_BridgeCorrectly {
     
     {
-        CSFrom *from = CSFromCreate([TestEntity1 class]);
+        CSFrom *from = CSFromClass([TestEntity1 class]);
         XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
         XCTAssertNil(from.configurations);
     }
     {
-        CSFrom *from = CSFromCreate([TestEntity1 class], [NSNull null]);
+        CSFrom *from = CSFromClass([TestEntity1 class], [NSNull null]);
         XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
         
         NSArray *configurations = @[[NSNull null]];
         XCTAssertEqualObjects(from.configurations, configurations);
     }
     {
-        CSFrom *from = CSFromCreate([TestEntity1 class], @"Config1");
+        CSFrom *from = CSFromClass([TestEntity1 class], @"Config1");
         XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
         
         NSArray *configurations = @[@"Config1"];
         XCTAssertEqualObjects(from.configurations, configurations);
     }
     {
-        CSFrom *from = CSFromCreate([TestEntity1 class], @[[NSNull null], @"Config2"]);
+        CSFrom *from = CSFromClass([TestEntity1 class], @[[NSNull null], @"Config2"]);
         XCTAssertEqualObjects(from.entityClass, [TestEntity1 class]);
         
         NSArray *configurations = @[[NSNull null], @"Config2"];
diff --git a/Sources/ObjectiveC/CSFrom.swift b/Sources/ObjectiveC/CSFrom.swift
index 579d592..2e22bff 100644
--- a/Sources/ObjectiveC/CSFrom.swift
+++ b/Sources/ObjectiveC/CSFrom.swift
@@ -66,7 +66,7 @@ public final class CSFrom: NSObject, CoreStoreObjectiveCType {
     /**
      Initializes a `CSFrom` clause with the specified entity class.
      ```
-     MyPersonEntity *people = [transaction fetchAllFrom:CSFromCreate([MyPersonEntity class])];
+     MyPersonEntity *people = [transaction fetchAllFrom:CSFromClass([MyPersonEntity class])];
      ```
      
      - parameter entityClass: the `NSManagedObject` class type to be created
@@ -81,7 +81,7 @@ public final class CSFrom: NSObject, CoreStoreObjectiveCType {
      Initializes a `CSFrom` clause with the specified configurations.
      ```
      MyPersonEntity *people = [transaction fetchAllFrom:
-        CSFromCreate([MyPersonEntity class], @"Config1")];
+        CSFromClass([MyPersonEntity class], @"Config1")];
      ```
      
      - parameter configuration: the `NSPersistentStore` configuration name to associate objects from. This parameter is required if multiple configurations contain the created `NSManagedObject`'s entity type. Set to `[NSNull null]` to use the default configuration.
@@ -106,7 +106,7 @@ public final class CSFrom: NSObject, CoreStoreObjectiveCType {
      Initializes a `CSFrom` clause with the specified configurations.
      ```
      MyPersonEntity *people = [transaction fetchAllFrom:
-        CSFromCreate([MyPersonEntity class],
+        CSFromClass([MyPersonEntity class],
                      @[[NSNull null], @"Config1"])];
      ```
      
diff --git a/Sources/ObjectiveC/CSOrderBy.swift b/Sources/ObjectiveC/CSOrderBy.swift
index e900559..e28c897 100644
--- a/Sources/ObjectiveC/CSOrderBy.swift
+++ b/Sources/ObjectiveC/CSOrderBy.swift
@@ -50,7 +50,7 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl
      Initializes a `CSOrderBy` clause with a single sort descriptor
      ```
      MyPersonEntity *people = [transaction
-        fetchAllFrom:CSFromCreate([MyPersonEntity class])
+        fetchAllFrom:CSFromClass([MyPersonEntity class])
         fetchClauses:@[CSOrderBySortKey(CSSortAscending(@"fullname"))]]];
      ```
      
@@ -66,7 +66,7 @@ public final class CSOrderBy: NSObject, CSFetchClause, CSQueryClause, CSDeleteCl
      Initializes a `CSOrderBy` clause with a list of sort descriptors
      ```
      MyPersonEntity *people = [transaction
-        fetchAllFrom:CSFromCreate([MyPersonEntity class])
+        fetchAllFrom:CSFromClass([MyPersonEntity class])
         fetchClauses:@[CSOrderBySortKeys(CSSortAscending(@"fullname"), CSSortDescending(@"age"), nil))]]];
      ```
      
diff --git a/Sources/ObjectiveC/CSSelect.swift b/Sources/ObjectiveC/CSSelect.swift
index fd6c1c3..65e0c21 100644
--- a/Sources/ObjectiveC/CSSelect.swift
+++ b/Sources/ObjectiveC/CSSelect.swift
@@ -217,7 +217,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSNumber` values.
      ```
      NSNumber *maxAge = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectNumber(CSAggregateMax(@"age"))
         // ...
      ```
@@ -233,7 +233,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSDecimalNumber` values.
      ```
      NSDecimalNumber *averagePrice = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectDecimal(CSAggregateAverage(@"price"))
         // ...
      ```
@@ -249,7 +249,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSString` values.
      ```
      NSString *fullname = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectString(CSAttribute(@"fullname"))
         // ...
      ```
@@ -265,7 +265,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSDate` values.
      ```
      NSDate *lastUpdate = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectDate(CSAggregateMax(@"updatedDate"))
         // ...
      ```
@@ -281,7 +281,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSData` values.
      ```
      NSData *imageData = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectData(CSAttribute(@"imageData"))
         // ...
      ```
@@ -297,7 +297,7 @@ public final class CSSelect: NSObject {
      Creates a `CSSelect` clause for querying `NSManagedObjectID` values.
      ```
      NSManagedObjectID *objectID = [CSCoreStore
-        queryValueFrom:CSFromCreate([MyPersonEntity class])
+        queryValueFrom:CSFromClass([MyPersonEntity class])
         select:CSSelectObjectID()
         // ...
      ```
diff --git a/Sources/ObjectiveC/CSWhere.swift b/Sources/ObjectiveC/CSWhere.swift
index 3710187..15a4f12 100644
--- a/Sources/ObjectiveC/CSWhere.swift
+++ b/Sources/ObjectiveC/CSWhere.swift
@@ -50,7 +50,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
      Initializes a `CSWhere` clause with a predicate that always evaluates to the specified boolean value
      ```
      MyPersonEntity *people = [transaction
-        fetchAllFrom:CSFromCreate([MyPersonEntity class])
+        fetchAllFrom:CSFromClass([MyPersonEntity class])
         fetchClauses:@[CSWhereValue(YES)]]];
      ```
      
@@ -67,7 +67,7 @@ public final class CSWhere: NSObject, CSFetchClause, CSQueryClause, CSDeleteClau
      ```
      NSPredicate *predicate = // ...
      MyPersonEntity *people = [transaction
-        fetchAllFrom:CSFromCreate([MyPersonEntity class])
+        fetchAllFrom:CSFromClass([MyPersonEntity class])
         fetchClauses:@[CSWherePredicate(predicate)]];
      ```
      
diff --git a/Sources/ObjectiveC/CoreStoreBridge.h b/Sources/ObjectiveC/CoreStoreBridge.h
index e83b75c..98bfa81 100644
--- a/Sources/ObjectiveC/CoreStoreBridge.h
+++ b/Sources/ObjectiveC/CoreStoreBridge.h
@@ -53,7 +53,7 @@
  
  @code
  MyPersonEntity *people = [transaction fetchAllFrom:
-    CSFromCreate([MyPersonEntity class])];
+    CSFromClass([MyPersonEntity class])];
  @endcode
  
  @param entityClass
@@ -63,7 +63,7 @@
  a <tt>CSFrom</tt> clause with the specified entity class
  */
 CS_OBJC_EXTERN CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAINED;
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAINED;
 
 /**
  @abstract
@@ -71,7 +71,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAIN
  
  @code
  MyPersonEntity *people = [transaction fetchAllFrom:
-    CSFromCreate([MyPersonEntity class], @"Configuration1")];
+    CSFromClass([MyPersonEntity class], @"Configuration1")];
  @endcode
  
  @param entityClass
@@ -84,7 +84,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAIN
  a <tt>CSFrom</tt> clause with the specified configuration
  */
 CS_OBJC_EXTERN CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED;
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED;
 
 /**
  @abstract
@@ -92,7 +92,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSNull *_Nonnull confi
  
  @code
  MyPersonEntity *people = [transaction fetchAllFrom:
-    CSFromCreate([MyPersonEntity class], @"Configuration1")];
+    CSFromClass([MyPersonEntity class], @"Configuration1")];
  @endcode
  
  @param entityClass
@@ -105,7 +105,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSNull *_Nonnull confi
  a <tt>CSFrom</tt> clause with the specified configuration
  */
 CS_OBJC_EXTERN CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSString *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED;
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED;
 
 /**
  @abstract
@@ -113,8 +113,8 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSString *_Nonnull con
  
  @code
  MyPersonEntity *people = [transaction fetchAllFrom:
-    CSFromCreate([MyPersonEntity class],
-                 @[[NSNull null], @"Configuration1"])];
+    CSFromClass([MyPersonEntity class],
+                @[[NSNull null], @"Configuration1"])];
  @endcode
  
  @param entityClass
@@ -127,7 +127,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSString *_Nonnull con
  a <tt>CSFrom</tt> clause with the specified configurations
  */
 CS_OBJC_EXTERN CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSArray<id> *_Nonnull configurations) CS_OBJC_RETURNS_RETAINED;
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSArray<id> *_Nonnull configurations) CS_OBJC_RETURNS_RETAINED;
 
 
 // MARK: - Select
@@ -141,7 +141,7 @@ CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSArray<id> *_Nonnull
  
  @code
  NSNumber *maxAge = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectNumber(CSAggregateMax(@"age"))
     // ...
  @endcode
@@ -161,7 +161,7 @@ CSSelect *_Nonnull CSSelectNumber(CSSelectTerm *_Nonnull selectTerm) CS_OBJC_RET
  
  @code
  NSDecimalNumber *averagePrice = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectDecimal(CSAggregateAverage(@"price"))
     // ...
  @endcode
@@ -181,7 +181,7 @@ CSSelect *_Nonnull CSSelectDecimal(CSSelectTerm *_Nonnull selectTerm) CS_OBJC_RE
  
  @code
  NSString *fullname = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectString(CSAttribute(@"fullname"))
     // ...
  @endcode
@@ -201,7 +201,7 @@ CSSelect *_Nonnull CSSelectString(CSSelectTerm *_Nonnull selectTerm) CS_OBJC_RET
  
  @code
  NSDate *lastUpdate = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectDate(CSAggregateMax(@"updatedDate"))
     // ...
  @endcode
@@ -221,7 +221,7 @@ CSSelect *_Nonnull CSSelectDate(CSSelectTerm *_Nonnull selectTerm) CS_OBJC_RETUR
  
  @code
  NSData *imageData = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectData(CSAttribute(@"imageData"))
     // ...
  @endcode
@@ -241,7 +241,7 @@ CSSelect *_Nonnull CSSelectData(CSSelectTerm *_Nonnull selectTerm) CS_OBJC_RETUR
  
  @code
  NSManagedObjectID *objectID = [CSCoreStore
-    queryValueFrom:CSFromCreate([MyPersonEntity class])
+    queryValueFrom:CSFromClass([MyPersonEntity class])
     select:CSSelectObjectID()
     // ...
  @endcode
@@ -266,7 +266,7 @@ CSSelect *_Nonnull CSSelectObjectID() CS_OBJC_RETURNS_RETAINED;
  
  @code
  MyPersonEntity *people = [transaction 
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSWhereValue(YES)]];
  @endcode
  
@@ -285,7 +285,7 @@ CSWhere *_Nonnull CSWhereValue(BOOL value) CS_OBJC_RETURNS_RETAINED;
  
  @code
  MyPersonEntity *people = [transaction
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSWhereFormat(@"%K == %@", @"key", @"value")]];
  @endcode
  
@@ -308,7 +308,7 @@ CSWhere *_Nonnull CSWhereFormat(NSString *_Nonnull format, ...) CS_OBJC_RETURNS_
  @code
  NSPredicate *predicate = // ...
  MyPersonEntity *people = [transaction
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSWherePredicate(predicate)]];
  @endcode
  
@@ -332,7 +332,7 @@ CSWhere *_Nonnull CSWherePredicate(NSPredicate *_Nonnull predicate) CS_OBJC_RETU
  
  @code
  MyPersonEntity *people = [CSCoreStore
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSOrderBySortKey(CSSortAscending(@"fullname"))]]];
  @endcode
  
@@ -351,7 +351,7 @@ NSSortDescriptor *_Nonnull CSSortAscending(NSString *_Nonnull key) CS_OBJC_RETUR
  
  @code
  MyPersonEntity *people = [CSCoreStore
-        fetchAllFrom:CSFromCreate([MyPersonEntity class])
+        fetchAllFrom:CSFromClass([MyPersonEntity class])
  fetchClauses:@[CSOrderBySortKey(CSSortDescending(@"fullname"))]]];
  @endcode
  
@@ -370,7 +370,7 @@ NSSortDescriptor *_Nonnull CSSortDescending(NSString *_Nonnull key)  CS_OBJC_RET
  
  @code
  MyPersonEntity *people = [transaction
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSOrderBySortKey(CSSortAscending(@"fullname"))]]];
  @endcode
  
@@ -389,7 +389,7 @@ CSOrderBy *_Nonnull CSOrderBySortKey(NSSortDescriptor *_Nonnull sortDescriptor)
  
  @code
  MyPersonEntity *people = [transaction
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSOrderBySortKeys(CSSortAscending(@"fullname"), CSSortDescending(@"age"), nil))]]];
  @endcode
  
@@ -408,7 +408,7 @@ CSOrderBy *_Nonnull CSOrderBySortKeys(NSSortDescriptor *_Nonnull sortDescriptor,
  
  @code
  MyPersonEntity *people = [transaction
-    fetchAllFrom:CSFromCreate([MyPersonEntity class])
+    fetchAllFrom:CSFromClass([MyPersonEntity class])
     fetchClauses:@[CSOrderBySortKeys(@[CSSortAscending(@"fullname"), CSSortDescending(@"age")]))]]];
  @endcode
  
diff --git a/Sources/ObjectiveC/CoreStoreBridge.m b/Sources/ObjectiveC/CoreStoreBridge.m
index 8f25e99..f2cc659 100644
--- a/Sources/ObjectiveC/CoreStoreBridge.m
+++ b/Sources/ObjectiveC/CoreStoreBridge.m
@@ -28,25 +28,25 @@
 
 
 CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAINED {
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass) CS_OBJC_RETURNS_RETAINED {
     
     return [[CSFrom alloc] initWithEntityClass:entityClass];
 }
 
 CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED {
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSNull *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED {
     
     return [[CSFrom alloc] initWithEntityClass:entityClass configuration:configuration];
 }
 
 CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSString *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED {
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSString *_Nonnull configuration) CS_OBJC_RETURNS_RETAINED {
     
     return [[CSFrom alloc] initWithEntityClass:entityClass configuration:configuration];
 }
 
 CS_OBJC_OVERLOADABLE
-CSFrom *_Nonnull CSFromCreate(Class _Nonnull entityClass, NSArray<id> *_Nonnull configurations) CS_OBJC_RETURNS_RETAINED {
+CSFrom *_Nonnull CSFromClass(Class _Nonnull entityClass, NSArray<id> *_Nonnull configurations) CS_OBJC_RETURNS_RETAINED {
     
     return [[CSFrom alloc] initWithEntityClass:entityClass configurations:configurations];
 }