diff --git a/examples/cpp/game_mechanics/inventory_system/src/main.cpp b/examples/cpp/game_mechanics/inventory_system/src/main.cpp
index cb9e9a403..b485eb3d2 100644
--- a/examples/cpp/game_mechanics/inventory_system/src/main.cpp
+++ b/examples/cpp/game_mechanics/inventory_system/src/main.cpp
@@ -99,7 +99,7 @@ flecs::entity get_container(flecs::entity container) {
 template <typename Func>
 void for_each_item(flecs::entity container, const Func& func) {
     container.world().filter_builder()
-        .term<ContainedBy>(container)
+        .with<ContainedBy>(container)
         .build()
         .each(func);
 }
diff --git a/examples/cpp/relationships/enum_relations/src/main.cpp b/examples/cpp/relationships/enum_relations/src/main.cpp
index 8268af7f7..b65cbf289 100644
--- a/examples/cpp/relationships/enum_relations/src/main.cpp
+++ b/examples/cpp/relationships/enum_relations/src/main.cpp
@@ -59,7 +59,7 @@ int main(int, char *[]) {
 
     // Iterate all entities with a Tile relationship
     ecs.filter_builder()
-        .term<Tile>(flecs::Wildcard)
+        .with<Tile>(flecs::Wildcard)
         .build()
         .each([&](flecs::iter& it, size_t) {
             flecs::entity tile_constant = it.pair(1).second();
@@ -73,8 +73,8 @@ int main(int, char *[]) {
 
     // Iterate only occupied tiles
     ecs.filter_builder()
-        .term<Tile>(flecs::Wildcard)
-        .term(TileStatus::Occupied)
+        .with<Tile>(flecs::Wildcard)
+        .with(TileStatus::Occupied)
         .build()
         .each([&](flecs::iter& it, size_t) {
             flecs::entity tile_constant = it.pair(1).second();
diff --git a/examples/cpp/relationships/union/src/main.cpp b/examples/cpp/relationships/union/src/main.cpp
index 9f5551714..2007d7dca 100644
--- a/examples/cpp/relationships/union/src/main.cpp
+++ b/examples/cpp/relationships/union/src/main.cpp
@@ -37,8 +37,8 @@ int main(int argc, char *argv[]) {
     // Create a query that subscribes for all entities that have a Direction
     // and that are walking
     flecs::query<> q = ecs.query_builder()
-        .term(Walking)
-        .term<Direction>(flecs::Wildcard)
+        .with(Walking)
+        .with<Direction>(flecs::Wildcard)
         .build();
 
     // Create a few entities with various state combinations
diff --git a/examples/cpp/rules/cyclic_variables/src/main.cpp b/examples/cpp/rules/cyclic_variables/src/main.cpp
index 01455da29..6817ccb56 100644
--- a/examples/cpp/rules/cyclic_variables/src/main.cpp
+++ b/examples/cpp/rules/cyclic_variables/src/main.cpp
@@ -34,8 +34,8 @@ int main(int, char *[]) {
     // Because this query does not use This at all, the entities array will not
     // be populated, and it.count() will always be 0.
     flecs::rule<> r = ecs.rule_builder()
-        .term<Likes>("$Y").src("$X")
-        .term<Likes>("$X").src("$Y")
+        .with<Likes>("$Y").src("$X")
+        .with<Likes>("$X").src("$Y")
         .build();
 
     // Lookup the index of the variables. This will let us quickly lookup their
diff --git a/examples/cpp/rules/facts/src/main.cpp b/examples/cpp/rules/facts/src/main.cpp
index d5db2ebe6..910d9a9d8 100644
--- a/examples/cpp/rules/facts/src/main.cpp
+++ b/examples/cpp/rules/facts/src/main.cpp
@@ -47,8 +47,8 @@ int main(int, char *[]) {
     // entities directly, but then we would have to create a rule for each
     // fact, vs reusing a single rule for multiple facts.
     flecs::rule<> friends = ecs.rule_builder()
-        .term<Likes>("$Y").src("$X")
-        .term<Likes>("$X").src("$Y")
+        .with<Likes>("$Y").src("$X")
+        .with<Likes>("$X").src("$Y")
         .build();
 
     int x_var = friends.find_var("X");
diff --git a/examples/cpp/rules/setting_variables/src/main.cpp b/examples/cpp/rules/setting_variables/src/main.cpp
index 6d741a9f5..b33fe7129 100644
--- a/examples/cpp/rules/setting_variables/src/main.cpp
+++ b/examples/cpp/rules/setting_variables/src/main.cpp
@@ -71,8 +71,8 @@ int main(int, char *[]) {
     // - find all entities with (Platoon, *), store * in _Platoon
     // - check if _Platoon has (Player, *), store * in _Player
     flecs::rule<RangedUnit> r = ecs.rule_builder<RangedUnit>()
-        .term<Platoon>().second("$Platoon")
-        .term<Player>("$Player").src("$Platoon")
+        .with<Platoon>().second("$Platoon")
+        .with<Player>("$Player").src("$Platoon")
         .build();
 
     // If we would iterate this rule it would return all ranged units for all
diff --git a/examples/cpp/rules/transitive_queries/src/main.cpp b/examples/cpp/rules/transitive_queries/src/main.cpp
index 133e030ee..58437443e 100644
--- a/examples/cpp/rules/transitive_queries/src/main.cpp
+++ b/examples/cpp/rules/transitive_queries/src/main.cpp
@@ -97,9 +97,9 @@ int main(int, char *[]) {
     // The equivalent of this query in the DSL is:
     //   Person, (LocatedIn, $Location), Country($Location)
     flecs::rule<> r = ecs.rule_builder()
-        .term<Person>()
-        .term<LocatedIn>("$Location")
-        .term<Country>().src("$Location")
+        .with<Person>()
+        .with<LocatedIn>("$Location")
+        .with<Country>().src("$Location")
         .build();
     
     // Lookup the index of the variable. This will let us quickly lookup its
diff --git a/examples/cpp/systems/no_readonly/src/main.cpp b/examples/cpp/systems/no_readonly/src/main.cpp
index 3f5ddd827..dd4f3b75d 100644
--- a/examples/cpp/systems/no_readonly/src/main.cpp
+++ b/examples/cpp/systems/no_readonly/src/main.cpp
@@ -22,8 +22,8 @@ int main(int, char *[]) {
 
     // Create query to find all waiters without a plate
     flecs::query<> q_waiter = ecs.query_builder()
-        .term<Waiter>()
-        .term<Plate>(flecs::Wildcard).not_()
+        .with<Waiter>()
+        .without<Plate>(flecs::Wildcard)
         .build();
 
     // System that assigns plates to waiter. By making this system no_readonly