diff --git a/src/main/java/li/strolch/model/query/OrderQuery.java b/src/main/java/li/strolch/model/query/OrderQuery.java
index 0863781e9..dac4c0d9f 100644
--- a/src/main/java/li/strolch/model/query/OrderQuery.java
+++ b/src/main/java/li/strolch/model/query/OrderQuery.java
@@ -52,7 +52,7 @@ public class OrderQuery<U> extends StrolchQuery<OrderQueryVisitor> {
 	 * @param navigation
 	 * @return
 	 */
-	public static OrderQuery<Order> orderQuery(Navigation navigation) {
+	public static OrderQuery<Order> query(Navigation navigation) {
 		return new OrderQuery<Order>(navigation, new NoStrategyOrderVisitor());
 	}
 
@@ -64,7 +64,7 @@ public class OrderQuery<U> extends StrolchQuery<OrderQueryVisitor> {
 	 *            the type of Order to navigate to
 	 * @return
 	 */
-	public static OrderQuery<Order> orderQuery(String type) {
+	public static OrderQuery<Order> query(String type) {
 		return new OrderQuery<Order>(new StrolchTypeNavigation(type), new NoStrategyOrderVisitor());
 	}
 
@@ -78,7 +78,7 @@ public class OrderQuery<U> extends StrolchQuery<OrderQueryVisitor> {
 	 *            the visitor to use for transformation
 	 * @return
 	 */
-	public static <U> OrderQuery<U> orderQuery(String type, OrderVisitor<U> orderVisitor) {
+	public static <U> OrderQuery<U> query(String type, OrderVisitor<U> orderVisitor) {
 		return new OrderQuery<U>(new StrolchTypeNavigation(type), orderVisitor);
 	}
 }
diff --git a/src/main/java/li/strolch/model/query/ResourceQuery.java b/src/main/java/li/strolch/model/query/ResourceQuery.java
index 5176fe08c..6133b7c5b 100644
--- a/src/main/java/li/strolch/model/query/ResourceQuery.java
+++ b/src/main/java/li/strolch/model/query/ResourceQuery.java
@@ -58,7 +58,7 @@ public class ResourceQuery<U> extends StrolchQuery<ResourceQueryVisitor> {
 	 * @param navigation
 	 * @return
 	 */
-	public static ResourceQuery<Resource> resourceQuery(Navigation navigation) {
+	public static ResourceQuery<Resource> query(Navigation navigation) {
 		return new ResourceQuery<Resource>(navigation, new NoStrategyResourceVisitor());
 	}
 
@@ -70,7 +70,7 @@ public class ResourceQuery<U> extends StrolchQuery<ResourceQueryVisitor> {
 	 *            the type of {@link Resource} to navigate to
 	 * @return
 	 */
-	public static ResourceQuery<Resource> resourceQuery(String type) {
+	public static ResourceQuery<Resource> query(String type) {
 		return new ResourceQuery<Resource>(new StrolchTypeNavigation(type), new NoStrategyResourceVisitor());
 	}
 
@@ -84,7 +84,7 @@ public class ResourceQuery<U> extends StrolchQuery<ResourceQueryVisitor> {
 	 *            the visitor to use for transformation
 	 * @return
 	 */
-	public static <U> ResourceQuery<U> resourceQuery(String type, ResourceVisitor<U> resourceVisitor) {
+	public static <U> ResourceQuery<U> query(String type, ResourceVisitor<U> resourceVisitor) {
 		return new ResourceQuery<U>(new StrolchTypeNavigation(type), resourceVisitor);
 	}
 }