diff --git a/hidl/sensors/Android.bp b/hidl/sensors/Android.bp
index 4edf7b9..ecf6412 100644
--- a/hidl/sensors/Android.bp
+++ b/hidl/sensors/Android.bp
@@ -1,5 +1,5 @@
 cc_library_shared {
-    name: "android.hardware.sensors@1.0-impl",
+    name: "android.hardware.sensors@1.0-impl.samsung",
     defaults: ["hidl_defaults"],
     proprietary: true,
     relative_install_path: "hw",
@@ -18,5 +18,4 @@
         "android.hardware.sensors@1.0-convert",
         "multihal",
     ],
-    local_include_dirs: ["include/sensors"],
 }
diff --git a/hidl/sensors/Sensors.cpp b/hidl/sensors/Sensors.cpp
index 1100dd6..678ac72 100644
--- a/hidl/sensors/Sensors.cpp
+++ b/hidl/sensors/Sensors.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "Sensors.h"
-#include "convert.h"
+#include <sensors/convert.h>
 #include "multihal.h"
 
 #include <android-base/logging.h>
diff --git a/hidl/sensors/Sensors.h b/hidl/sensors/Sensors.h
index be00a96..a43a00d 100644
--- a/hidl/sensors/Sensors.h
+++ b/hidl/sensors/Sensors.h
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#ifndef HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#ifndef HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_
 
-#define HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#define HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_
 
 #include <android-base/macros.h>
 #include <android/hardware/sensors/1.0/ISensors.h>
@@ -85,4 +85,4 @@
 }  // namespace hardware
 }  // namespace android
 
-#endif  // HARDWARE_INTERFACES_SENSORS_V1_0_DEFAULT_SENSORS_H_
+#endif  // HARDWARE_INTERFACES_SENSORS_V1_0_SAMSUNG_SENSORS_H_