diff --git a/scripts/generate-iot-credential.sh b/scripts/generate-iot-credential.sh
index 31b9ab0b0..29801cb01 100755
--- a/scripts/generate-iot-credential.sh
+++ b/scripts/generate-iot-credential.sh
@@ -3,7 +3,6 @@
 # You can use this script to setup environment variables in the shell which samples run on.
 # https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/how-iot.html
 
-prefix=$1
 thingName="producerc_thing"
 thingTypeName="producerc_thing_type"
 iotPolicyName="producerc_policy"
diff --git a/src/include/com/amazonaws/kinesis/video/common/Include.h b/src/include/com/amazonaws/kinesis/video/common/Include.h
index 730b0b2bb..045d43cd1 100644
--- a/src/include/com/amazonaws/kinesis/video/common/Include.h
+++ b/src/include/com/amazonaws/kinesis/video/common/Include.h
@@ -139,9 +139,9 @@ extern "C" {
 #define MAX_ROLE_ALIAS_LEN 128
 
 /**
- * Maximum allowed string length for IoT thing name
+ * Maximum allowed string length for IoT thing name: https://docs.aws.amazon.com/iot/latest/apireference/API_CreateThing.html
  */
-#define MAX_IOT_THING_NAME_LEN MAX_STREAM_NAME_LEN
+#define MAX_IOT_THING_NAME_LEN 128
 
 /**
  * Maximum allowed request header length