diff --git a/src/doc/high_level_api.rst b/src/doc/high_level_api.rst
index 603052b135ad2289caea7e3bed59ae9d3301f811..e92f2dd5e326b14222ad3c776ce5f5ed1ed31536 100644
--- a/src/doc/high_level_api.rst
+++ b/src/doc/high_level_api.rst
@@ -60,7 +60,7 @@ it using its high level representation:
 
    from caosdb.high_level_api import query
 
-   res = query("FIND Record Experiment")
+   res = query("FIND Experiment")
    experiment = res[0]
    # Use a property:
    print(experiment.date)
@@ -80,7 +80,7 @@ series of commands to achieve the same result:
 
    import caosdb as db
 
-   res = db.execute_query("FIND Record Experiment")
+   res = db.execute_query("FIND Experiment")
    output = res.get_property("output")
    output_file = db.File(id=output.value[0].id).retrieve()
    print(output_file.path)
diff --git a/src/doc/tutorials/complex_data_models.rst b/src/doc/tutorials/complex_data_models.rst
index 0fa868e78bb45a2905dc99392a3a28a9832d369e..7b45b6a2681bcf781fd4acc9329ffada28d4e01c 100644
--- a/src/doc/tutorials/complex_data_models.rst
+++ b/src/doc/tutorials/complex_data_models.rst
@@ -69,8 +69,9 @@ Examples
    c.insert()
 
    # Useful for testing: wait until the user presses a key
-   # Meanwhile have a look at the WebUI: You can e.g. query "FIND Test*" to view
-   # all the entities created here and see the relations and links between them.
+   # Meanwhile have a look at the WebUI: You can e.g. query "FIND ENTITY Test*"
+   # to view all the entities created here and see the relations and links
+   # between them.
    b = input("Press any key to cleanup.")
    # cleanup everything after the user presses any button.
    c.delete()
diff --git a/src/doc/tutorials/first_steps.rst b/src/doc/tutorials/first_steps.rst
index 486cd4d437c8b13a253cadc8ed45f49b4a7634e4..7366d391cdf50b1d9f9107fc2d47f28d9df7bf7f 100644
--- a/src/doc/tutorials/first_steps.rst
+++ b/src/doc/tutorials/first_steps.rst
@@ -25,7 +25,7 @@ However, you can also translate the examples to the data model that you have at
 
 Let's start with a simple query.
 
->>> response = db.execute_query("FIND RECORD Guitar")
+>>> response = db.execute_query("FIND Guitar")
 
 Queries work the same way as in the web interface. You simply provide the 
 query string to the corresponding function (``db.execute_query``). However, the result is not