diff --git a/tutorial/cpp/CppClient.cpp b/tutorial/cpp/CppClient.cpp
index a3f17fe..4dac90c 100644
--- a/tutorial/cpp/CppClient.cpp
+++ b/tutorial/cpp/CppClient.cpp
@@ -53,7 +53,7 @@
     printf("1+1=%d\n", sum);
 
     Work work;
-    work.op = DIVIDE;
+    work.op = Operation::DIVIDE;
     work.num1 = 1;
     work.num2 = 0;
 
@@ -64,7 +64,7 @@
       printf("InvalidOperation: %s\n", io.why.c_str());
     }
 
-    work.op = SUBTRACT;
+    work.op = Operation::SUBTRACT;
     work.num1 = 15;
     work.num2 = 10;
     int32_t diff = client.calculate(1, work);
diff --git a/tutorial/cpp/CppServer.cpp b/tutorial/cpp/CppServer.cpp
index 23c2b83..860381e 100644
--- a/tutorial/cpp/CppServer.cpp
+++ b/tutorial/cpp/CppServer.cpp
@@ -61,16 +61,16 @@
     int32_t val;
 
     switch (work.op) {
-    case ADD:
+    case Operation::ADD:
       val = work.num1 + work.num2;
       break;
-    case SUBTRACT:
+    case Operation::SUBTRACT:
       val = work.num1 - work.num2;
       break;
-    case MULTIPLY:
+    case Operation::MULTIPLY:
       val = work.num1 * work.num2;
       break;
-    case DIVIDE:
+    case Operation::DIVIDE:
       if (work.num2 == 0) {
         InvalidOperation io;
         io.what = work.op;