diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 9c56c4c5b..c5ef07759 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -4,8 +4,8 @@ project(aws-iot-device-sdk-cpp-v2-samples)
 
 add_subdirectory(device_defender/basic_report)
 add_subdirectory(device_defender/mqtt5_basic_report)
-add_subdirectory(fleet_provisioning/provision_basic)
-add_subdirectory(fleet_provisioning/provision_csr)
+add_subdirectory(fleet_provisioning/provision-basic)
+add_subdirectory(fleet_provisioning/provision-csr)
 add_subdirectory(greengrass/ipc)
 add_subdirectory(greengrass/basic_discovery)
 add_subdirectory(jobs/jobs-sandbox)
diff --git a/samples/deprecated/fleet_provisioning/fleet_provisioning/main.cpp b/samples/deprecated/fleet_provisioning/fleet_provisioning/main.cpp
index cc1f5bcaf..a4d6692d5 100644
--- a/samples/deprecated/fleet_provisioning/fleet_provisioning/main.cpp
+++ b/samples/deprecated/fleet_provisioning/fleet_provisioning/main.cpp
@@ -29,7 +29,7 @@
 
 #include <fstream>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;
diff --git a/samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp b/samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
index f065fcfd8..ced729bf1 100644
--- a/samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
+++ b/samples/deprecated/fleet_provisioning/mqtt5_fleet_provisioning/main.cpp
@@ -30,7 +30,7 @@
 
 #include <fstream>
 
-#include "../../utils/CommandLineUtils.h"
+#include "../../../utils/CommandLineUtils.h"
 
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;
diff --git a/samples/fleet_provisioning/provision_basic/CMakeLists.txt b/samples/fleet_provisioning/provision-basic/CMakeLists.txt
similarity index 100%
rename from samples/fleet_provisioning/provision_basic/CMakeLists.txt
rename to samples/fleet_provisioning/provision-basic/CMakeLists.txt
diff --git a/samples/fleet_provisioning/provision_basic/README.md b/samples/fleet_provisioning/provision-basic/README.md
similarity index 99%
rename from samples/fleet_provisioning/provision_basic/README.md
rename to samples/fleet_provisioning/provision-basic/README.md
index 7bbbc4c0e..eb91cf679 100644
--- a/samples/fleet_provisioning/provision_basic/README.md
+++ b/samples/fleet_provisioning/provision-basic/README.md
@@ -255,7 +255,7 @@ make && make install
 Now build the sample:
 
 ``` sh
-cd samples/fleet_provisioning/provision_basic
+cd samples/fleet_provisioning/provision-basic
 mkdir _build
 cd _build
 cmake -DCMAKE_PREFIX_PATH=<sdk_install_path> ..
diff --git a/samples/fleet_provisioning/provision_basic/main.cpp b/samples/fleet_provisioning/provision-basic/main.cpp
similarity index 97%
rename from samples/fleet_provisioning/provision_basic/main.cpp
rename to samples/fleet_provisioning/provision-basic/main.cpp
index c08ea905d..f2211ddd5 100644
--- a/samples/fleet_provisioning/provision_basic/main.cpp
+++ b/samples/fleet_provisioning/provision-basic/main.cpp
@@ -18,7 +18,7 @@
 #include <aws/iotidentity/IotIdentityClientV2.h>
 #include <aws/iotidentity/RegisterThingRequest.h>
 #include <aws/iotidentity/RegisterThingResponse.h>
-#include <aws/iotidentity/V2ServiceError.h>
+#include <aws/iotidentity/V2ErrorResponse.h>
 
 #include <fstream>
 
@@ -27,7 +27,7 @@
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;
 
-static void s_onServiceError(const ServiceErrorV2<V2ServiceError> &serviceError, String operationName)
+static void s_onServiceError(const ServiceErrorV2<V2ErrorResponse> &serviceError, String operationName)
 {
     fprintf(
         stdout,
diff --git a/samples/fleet_provisioning/provision_csr/CMakeLists.txt b/samples/fleet_provisioning/provision-csr/CMakeLists.txt
similarity index 100%
rename from samples/fleet_provisioning/provision_csr/CMakeLists.txt
rename to samples/fleet_provisioning/provision-csr/CMakeLists.txt
diff --git a/samples/fleet_provisioning/provision_csr/README.md b/samples/fleet_provisioning/provision-csr/README.md
similarity index 99%
rename from samples/fleet_provisioning/provision_csr/README.md
rename to samples/fleet_provisioning/provision-csr/README.md
index a0d1e57a5..16a071e03 100644
--- a/samples/fleet_provisioning/provision_csr/README.md
+++ b/samples/fleet_provisioning/provision-csr/README.md
@@ -268,7 +268,7 @@ make && make install
 Now build the sample:
 
 ``` sh
-cd samples/fleet_provisioning/provision_csr
+cd samples/fleet_provisioning/provision-csr
 mkdir _build
 cd _build
 cmake -DCMAKE_PREFIX_PATH=<sdk_install_path> ..
diff --git a/samples/fleet_provisioning/provision_csr/main.cpp b/samples/fleet_provisioning/provision-csr/main.cpp
similarity index 98%
rename from samples/fleet_provisioning/provision_csr/main.cpp
rename to samples/fleet_provisioning/provision-csr/main.cpp
index fd1c858af..712ace753 100644
--- a/samples/fleet_provisioning/provision_csr/main.cpp
+++ b/samples/fleet_provisioning/provision-csr/main.cpp
@@ -18,7 +18,7 @@
 #include <aws/iotidentity/IotIdentityClientV2.h>
 #include <aws/iotidentity/RegisterThingRequest.h>
 #include <aws/iotidentity/RegisterThingResponse.h>
-#include <aws/iotidentity/V2ServiceError.h>
+#include <aws/iotidentity/V2ErrorResponse.h>
 
 #include <fstream>
 
@@ -27,7 +27,7 @@
 using namespace Aws::Crt;
 using namespace Aws::Iotidentity;
 
-static void s_onServiceError(const ServiceErrorV2<V2ServiceError> &serviceError, String operationName)
+static void s_onServiceError(const ServiceErrorV2<V2ErrorResponse> &serviceError, String operationName)
 {
     fprintf(
         stdout,
diff --git a/samples/jobs/jobs-sandbox/main.cpp b/samples/jobs/jobs-sandbox/main.cpp
index 72dc958e2..c0b589558 100644
--- a/samples/jobs/jobs-sandbox/main.cpp
+++ b/samples/jobs/jobs-sandbox/main.cpp
@@ -20,7 +20,7 @@
 #include <aws/iotjobs/StartNextPendingJobExecutionRequest.h>
 #include <aws/iotjobs/UpdateJobExecutionRequest.h>
 #include <aws/iotjobs/UpdateJobExecutionResponse.h>
-#include <aws/iotjobs/V2ServiceError.h>
+#include <aws/iotjobs/V2ErrorResponse.h>
 
 #include <algorithm>
 #include <condition_variable>
@@ -80,7 +80,7 @@ static String s_nibbleNextToken(String &input)
     return token;
 }
 
-static void s_onServiceError(const ServiceErrorV2<V2ServiceError> &serviceError, String operationName)
+static void s_onServiceError(const ServiceErrorV2<V2ErrorResponse> &serviceError, String operationName)
 {
     fprintf(
         stdout,
diff --git a/samples/shadow/shadow-sandbox/main.cpp b/samples/shadow/shadow-sandbox/main.cpp
index 75ece8b4a..71b507778 100644
--- a/samples/shadow/shadow-sandbox/main.cpp
+++ b/samples/shadow/shadow-sandbox/main.cpp
@@ -18,7 +18,7 @@
 #include <aws/iotshadow/ShadowUpdatedEvent.h>
 #include <aws/iotshadow/UpdateShadowRequest.h>
 #include <aws/iotshadow/UpdateShadowResponse.h>
-#include <aws/iotshadow/V2ServiceError.h>
+#include <aws/iotshadow/V2ErrorResponse.h>
 
 #include <algorithm>
 #include <condition_variable>
@@ -77,7 +77,7 @@ static void s_printHelp() {
     fprintf(stdout, "  update-reported <reported-state-as-JSON> -- updates the reported state of the IoT thing's shadow.  If the shadow does not exist, it will be created.\n\n");
 }
 
-static void s_onServiceError(const ServiceErrorV2<V2ServiceError> &serviceError, String operationName) {
+static void s_onServiceError(const ServiceErrorV2<V2ErrorResponse> &serviceError, String operationName) {
     fprintf(stdout, "%s failed with error code: %s\n", operationName.c_str(), aws_error_debug_str(serviceError.GetErrorCode()));
     if (serviceError.HasModeledError()) {
         const auto &modeledError = serviceError.GetModeledError();