diff --git a/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt b/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
index cb70849b6..0aac79475 100644
--- a/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
+++ b/lib/android_build/maesdk/src/main/cpp/CMakeLists.txt
@@ -160,6 +160,8 @@ target_include_directories(${TARGETNAME} PUBLIC
         ${SDK_ROOT}/sqlite
         ${SDK_ROOT}lib/pal
         ${SDK_ROOT}
+        ${SDK_ROOT}/lib/modules/sanitizer/detectors
+        ${SDK_ROOT}/lib/modules/sanitizer
         ${CURL_INCLUDE_DIRS})
 
 
diff --git a/lib/jni/SanitizerHelper.hpp b/lib/jni/SanitizerHelper.hpp
index a2308fcad..1c6e5f463 100644
--- a/lib/jni/SanitizerHelper.hpp
+++ b/lib/jni/SanitizerHelper.hpp
@@ -8,7 +8,7 @@
 
 namespace MAT_NS_BEGIN
 {
-    struct Sanitizer {
+    struct SanitizerHelper {
         /**
          * Get the current instance of Sanitizer.
          * @return SanitizerPtr if it is initialized, nullptr otherwise.
diff --git a/lib/jni/Sanitizer_jni.cpp b/lib/jni/Sanitizer_jni.cpp
index 8f2d7c847..830b072ab 100644
--- a/lib/jni/Sanitizer_jni.cpp
+++ b/lib/jni/Sanitizer_jni.cpp
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#include "ctmacros.hpp"
 #include "JniConvertors.hpp"
 #include "modules/sanitizer/Sanitizer.hpp"
 #include "SanitizerHelper.hpp"
@@ -38,10 +37,10 @@ Java_com_microsoft_applications_events_Sanitizer_nativeInitialize(
     SanitizerConfiguration sanitizerConfig(reinterpret_cast<ILogger*>(iLoggerNativePtr));
 
     if (notificationEventName != nullptr) {
-        config.NotificationEventName = JStringToStdString(env, notificationEventName).c_str();
+        sanitizerConfig.NotificationEventName = JStringToStdString(env, notificationEventName).c_str();
     }
 
-    spSanitizer = std::make_shared<Sanitizer>(config);
+    spSanitizer = std::make_shared<Sanitizer>(sanitizerConfig);
     return true;
 }
 
@@ -74,10 +73,10 @@ extern "C"
 JNIEXPORT jboolean JNICALL
 Java_com_microsoft_applications_events_Sanitizer_setEnabled(JNIEnv *env, jclass clazz,
                                                           jboolean enabled) {
-    if (spDataInspector == nullptr) {
+    if (spSanitizer == nullptr) {
         return false;
     }
 
-    spDataInspector->SetEnabled(static_cast<bool>(enabled));
+    spSanitizer->SetEnabled(static_cast<bool>(enabled));
     return true;
 }
\ No newline at end of file
diff --git a/lib/modules b/lib/modules
index bd40008a9..9b536f939 160000
--- a/lib/modules
+++ b/lib/modules
@@ -1 +1 @@
-Subproject commit bd40008a920f419c70c56fc5eed0f1f3e16fe58f
+Subproject commit 9b536f9393ab58560a96ec216173f91d2c7f819c