diff --git a/compiler/src/Language/Bond/Codegen/Cpp/Grpc_h.hs b/compiler/src/Language/Bond/Codegen/Cpp/Grpc_h.hs
index b901a8ea..39614320 100644
--- a/compiler/src/Language/Bond/Codegen/Cpp/Grpc_h.hs
+++ b/compiler/src/Language/Bond/Codegen/Cpp/Grpc_h.hs
@@ -49,11 +49,11 @@ grpc_h export_attribute cpp file imports declarations = ("_grpc.h", [lt|
 #pragma warning (disable: 4100 4267)
 #endif
 
-#include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/codegen/client_context.h>
-#include <grpc++/impl/codegen/completion_queue.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/channel_interface.h>
+#include <grpcpp/impl/codegen/client_context.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/compiler/tests/generated/generic_service_grpc.h b/compiler/tests/generated/generic_service_grpc.h
index b0a6e324..ced19419 100644
--- a/compiler/tests/generated/generic_service_grpc.h
+++ b/compiler/tests/generated/generic_service_grpc.h
@@ -25,11 +25,11 @@
 #pragma warning (disable: 4100 4267)
 #endif
 
-#include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/codegen/client_context.h>
-#include <grpc++/impl/codegen/completion_queue.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/channel_interface.h>
+#include <grpcpp/impl/codegen/client_context.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/compiler/tests/generated/service_attributes_grpc.h b/compiler/tests/generated/service_attributes_grpc.h
index 3a5cd33b..d88a72c4 100644
--- a/compiler/tests/generated/service_attributes_grpc.h
+++ b/compiler/tests/generated/service_attributes_grpc.h
@@ -25,11 +25,11 @@
 #pragma warning (disable: 4100 4267)
 #endif
 
-#include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/codegen/client_context.h>
-#include <grpc++/impl/codegen/completion_queue.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/channel_interface.h>
+#include <grpcpp/impl/codegen/client_context.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/compiler/tests/generated/service_grpc.h b/compiler/tests/generated/service_grpc.h
index 08f0db10..72468f66 100644
--- a/compiler/tests/generated/service_grpc.h
+++ b/compiler/tests/generated/service_grpc.h
@@ -26,11 +26,11 @@
 #pragma warning (disable: 4100 4267)
 #endif
 
-#include <grpc++/impl/codegen/channel_interface.h>
-#include <grpc++/impl/codegen/client_context.h>
-#include <grpc++/impl/codegen/completion_queue.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/channel_interface.h>
+#include <grpcpp/impl/codegen/client_context.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
 #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/bond_utils.h b/cpp/inc/bond/ext/grpc/bond_utils.h
index 5b77571e..309880b8 100644
--- a/cpp/inc/bond/ext/grpc/bond_utils.h
+++ b/cpp/inc/bond/ext/grpc/bond_utils.h
@@ -10,15 +10,15 @@
 #include <bond/core/reflection.h>
 #include <bond/stream/output_buffer.h>
 
-#include <grpc++/impl/codegen/config.h>
-#include <grpc++/impl/codegen/core_codegen.h>
-#include <grpc++/impl/codegen/core_codegen_interface.h>
-#include <grpc++/impl/codegen/serialization_traits.h>
-#include <grpc++/impl/codegen/status.h>
-#include <grpc++/impl/codegen/status_code_enum.h>
-#include <grpc++/support/slice.h>
 #include <grpc/impl/codegen/byte_buffer_reader.h>
 #include <grpc/impl/codegen/slice.h>
+#include <grpcpp/impl/codegen/config.h>
+#include <grpcpp/impl/codegen/core_codegen.h>
+#include <grpcpp/impl/codegen/core_codegen_interface.h>
+#include <grpcpp/impl/codegen/serialization_traits.h>
+#include <grpcpp/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/status_code_enum.h>
+#include <grpcpp/support/slice.h>
 
 #include <boost/assert.hpp>
 #include <boost/make_shared.hpp>
diff --git a/cpp/inc/bond/ext/grpc/client_callback.h b/cpp/inc/bond/ext/grpc/client_callback.h
index 88c630ff..74d87d17 100644
--- a/cpp/inc/bond/ext/grpc/client_callback.h
+++ b/cpp/inc/bond/ext/grpc/client_callback.h
@@ -7,8 +7,8 @@
 
 #include <bond/core/bonded.h>
 
-#include <grpc++/impl/codegen/status.h>
-#include <grpc++/client_context.h>
+#include <grpcpp/impl/codegen/status.h>
+#include <grpcpp/client_context.h>
 
 #include <memory>
 #include <utility>
diff --git a/cpp/inc/bond/ext/grpc/detail/client_call_data.h b/cpp/inc/bond/ext/grpc/detail/client_call_data.h
index 27e9639f..fde64de3 100644
--- a/cpp/inc/bond/ext/grpc/detail/client_call_data.h
+++ b/cpp/inc/bond/ext/grpc/detail/client_call_data.h
@@ -16,10 +16,10 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/service_type.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/service_type.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/detail/service.h b/cpp/inc/bond/ext/grpc/detail/service.h
index 27e81796..78c2a611 100644
--- a/cpp/inc/bond/ext/grpc/detail/service.h
+++ b/cpp/inc/bond/ext/grpc/detail/service.h
@@ -10,9 +10,10 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/service_type.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/rpc_service_method.h>
+#include <grpcpp/impl/codegen/service_type.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/detail/service_call_data.h b/cpp/inc/bond/ext/grpc/detail/service_call_data.h
index bbc5e99b..697af5e4 100644
--- a/cpp/inc/bond/ext/grpc/detail/service_call_data.h
+++ b/cpp/inc/bond/ext/grpc/detail/service_call_data.h
@@ -14,10 +14,10 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/impl/codegen/rpc_method.h>
-#include <grpc++/impl/codegen/service_type.h>
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/rpc_method.h>
+#include <grpcpp/impl/codegen/service_type.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/detail/unary_call_impl.h b/cpp/inc/bond/ext/grpc/detail/unary_call_impl.h
index ce008e4b..8fde752e 100644
--- a/cpp/inc/bond/ext/grpc/detail/unary_call_impl.h
+++ b/cpp/inc/bond/ext/grpc/detail/unary_call_impl.h
@@ -19,10 +19,10 @@
     #pragma warning (disable: 4100 4291 4702)
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/impl/codegen/async_unary_call.h>
-#include <grpc++/impl/codegen/status.h>
-#include <grpc++/impl/codegen/server_context.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/async_unary_call.h>
+#include <grpcpp/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/server_context.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/io_manager.h b/cpp/inc/bond/ext/grpc/io_manager.h
index e4dba9ec..00949e80 100644
--- a/cpp/inc/bond/ext/grpc/io_manager.h
+++ b/cpp/inc/bond/ext/grpc/io_manager.h
@@ -13,8 +13,8 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/impl/codegen/completion_queue.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/server.h b/cpp/inc/bond/ext/grpc/server.h
index a5667013..9753c937 100644
--- a/cpp/inc/bond/ext/grpc/server.h
+++ b/cpp/inc/bond/ext/grpc/server.h
@@ -46,7 +46,7 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/grpc++.h>
+#include <grpcpp/grpcpp.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/server_builder.h b/cpp/inc/bond/ext/grpc/server_builder.h
index 8c566190..ceed1fe0 100644
--- a/cpp/inc/bond/ext/grpc/server_builder.h
+++ b/cpp/inc/bond/ext/grpc/server_builder.h
@@ -47,7 +47,7 @@
     #pragma warning (disable: 4100 4702)
 #endif
 
-#include <grpc++/server_builder.h>
+#include <grpcpp/server_builder.h>
 
 #ifdef _MSC_VER
     #pragma warning (pop)
diff --git a/cpp/inc/bond/ext/grpc/wait_callback.h b/cpp/inc/bond/ext/grpc/wait_callback.h
index 7559dfa4..d285b1f0 100644
--- a/cpp/inc/bond/ext/grpc/wait_callback.h
+++ b/cpp/inc/bond/ext/grpc/wait_callback.h
@@ -9,7 +9,7 @@
 #include <bond/ext/grpc/exception.h>
 #include <bond/ext/grpc/client_callback.h>
 
-#include <grpc++/impl/codegen/status.h>
+#include <grpcpp/impl/codegen/status.h>
 
 #include <boost/optional.hpp>
 
diff --git a/cpp/test/grpc/io_manager.cpp b/cpp/test/grpc/io_manager.cpp
index e13a8f87..5f8be669 100644
--- a/cpp/test/grpc/io_manager.cpp
+++ b/cpp/test/grpc/io_manager.cpp
@@ -7,12 +7,12 @@
     #pragma warning(disable : 4505) // disable "unreferenced local function has been removed" warning
 #endif
 
-#include <grpc++/grpc++.h>
-#include <grpc++/alarm.h>
-#include <grpc++/impl/codegen/completion_queue.h>
-#include <grpc++/impl/grpc_library.h>
 #include <grpc/grpc.h>
 #include <grpc/support/time.h>
+#include <grpcpp/alarm.h>
+#include <grpcpp/grpcpp.h>
+#include <grpcpp/impl/codegen/completion_queue.h>
+#include <grpcpp/impl/grpc_library.h>
 
 #ifdef _MSC_VER
     #pragma warning(pop)