diff --git a/dataflow_cpp/test/dataflow_cpp_test_simple.cc b/dataflow_cpp/test/dataflow_cpp_test_simple.cc
index 71f58eb..c0b56db 100644
--- a/dataflow_cpp/test/dataflow_cpp_test_simple.cc
+++ b/dataflow_cpp/test/dataflow_cpp_test_simple.cc
@@ -156,7 +156,7 @@ void SimpleTest::TestBasic() {
   embb::mtapi::NodeAttributes node_attr;
   node_attr
     .SetCoreAffinity(core_set)
-    .SetQueueLimit(2);
+    .SetMaxQueues(2);
   embb::mtapi::Node::Initialize(
     MTAPI_DOMAIN_ID,
     MTAPI_NODE_ID,
diff --git a/doc/examples/mtapi/mtapi_cpp_wait_task-snippet.h b/doc/examples/mtapi/mtapi_cpp_wait_task-snippet.h
index c4f35a5..923fea2 100644
--- a/doc/examples/mtapi/mtapi_cpp_wait_task-snippet.h
+++ b/doc/examples/mtapi/mtapi_cpp_wait_task-snippet.h
@@ -1,5 +1,5 @@
-    status = task.Wait(MTAPI_INFINITE);
-    if (status != MTAPI_SUCCESS) {
-      printf("task failed with error: %d\n\n", status);
-      exit(status);
+    mtapi_status_t task_status = task.Wait(MTAPI_INFINITE);
+    if (task_status != MTAPI_SUCCESS) {
+      printf("task failed with error: %d\n\n", task_status);
+      exit(task_status);
     }