diff --git a/source/include/core_mqtt_config_defaults.h b/source/include/core_mqtt_config_defaults.h
index 5b6a391..821f8ac 100644
--- a/source/include/core_mqtt_config_defaults.h
+++ b/source/include/core_mqtt_config_defaults.h
@@ -98,9 +98,10 @@
* application-specific logging implementation that supports error logging.
*
* @note This logging macro is called in the MQTT library with parameters wrapped in
- * double parentheses to be ISO C89/C90 standard compliant. For an example
- * implementation of the logging macros, refer to mqtt_config.h files in the MQTT
- * demo folder and the reference implementation of the logging-stack in demos.
+ * double parentheses to be ISO C89/C90 standard compliant. For a reference
+ * POSIX implementation of the logging macros, refer to core_mqtt_config.h files, and the
+ * logging-stack in demos folder of the
+ * [AWS IoT Embedded C SDK repository](https://github.com/aws/aws-iot-device-sdk-embedded-C/tree/master).
*
* Default value: Error logging is turned off, and no code is generated for calls
* to the macro in the MQTT library on compilation.
@@ -117,9 +118,10 @@
* application-specific logging implementation that supports warning logging.
*
* @note This logging macro is called in the MQTT library with parameters wrapped in
- * double parentheses to be ISO C89/C90 standard compliant. For an example
- * implementation of the logging macros, refer to mqtt_config.h files in the MQTT
- * demo folder and the reference implementation of the logging-stack in demos.
+ * double parentheses to be ISO C89/C90 standard compliant. For a reference
+ * POSIX implementation of the logging macros, refer to core_mqtt_config.h files, and the
+ * logging-stack in demos folder of the
+ * [AWS IoT Embedded C SDK repository](https://github.com/aws/aws-iot-device-sdk-embedded-C/tree/master).
*
* Default value: Warning logs are turned off, and no code is generated for calls
* to the macro in the MQTT library on compilation.
@@ -136,9 +138,10 @@
* application-specific logging implementation that supports info logging.
*
* @note This logging macro is called in the MQTT library with parameters wrapped in
- * double parentheses to be ISO C89/C90 standard compliant. For an example
- * implementation of the logging macros, refer to mqtt_config.h files in the MQTT
- * demo folder and the reference implementation of the logging-stack in demos.
+ * double parentheses to be ISO C89/C90 standard compliant. For a reference
+ * POSIX implementation of the logging macros, refer to core_mqtt_config.h files, and the
+ * logging-stack in demos folder of the
+ * [AWS IoT Embedded C SDK repository](https://github.com/aws/aws-iot-device-sdk-embedded-C/tree/master).
*
* Default value: Info logging is turned off, and no code is generated for calls
* to the macro in the MQTT library on compilation.
@@ -155,9 +158,10 @@
* application-specific logging implementation that supports debug logging.
*
* @note This logging macro is called in the MQTT library with parameters wrapped in
- * double parentheses to be ISO C89/C90 standard compliant. For an example
- * implementation of the logging macros, refer to mqtt_config.h files in the MQTT
- * demo folder and the reference implementation of the logging-stack in demos.
+ * double parentheses to be ISO C89/C90 standard compliant. For a reference
+ * POSIX implementation of the logging macros, refer to core_mqtt_config.h files, and the
+ * logging-stack in demos folder of the
+ * [AWS IoT Embedded C SDK repository](https://github.com/aws/aws-iot-device-sdk-embedded-C/tree/master).
*
* Default value: Debug logging is turned off, and no code is generated for calls
* to the macro in the MQTT library on compilation.
diff --git a/source/lexicon.txt b/source/lexicon.txt
index fe4187c..eb5065f 100644
--- a/source/lexicon.txt
+++ b/source/lexicon.txt
@@ -6,6 +6,7 @@ addtogroup
api
apis
app
+aws
bool
br
bytesreceived
@@ -65,8 +66,10 @@ gettime
gettimefunction
gettimestampms
getunsubscribepacketsize
+github
headersize
http
+https
ifndef
inc
incomingpacket
@@ -76,6 +79,7 @@ initializeconnectinfo
initializesubscribeinfo
initializewillinfo
int
+iot
isn
iso
keepaliveintervalsec
@@ -185,6 +189,7 @@ pnetworkbuffer
pnetworkcontext
pnetworkinterface
pnewstate
+posix
ppacketid
ppacketidentifier
ppacketinfo
@@ -245,6 +250,7 @@ remainingtimems
resending
reservestate
responsecode
+sdk
searchstates
serializeack
serializeconnect