diff --git a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
index 272c17d..4319961 100644
--- a/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
+++ b/universal7885-common/apps/SamsungParts/jni/FlashlightBridge.cpp
@@ -2,7 +2,7 @@
 #include <hidl/HidlSupport.h>
 #include <hidl/LegacySupport.h>
 #include <hidl/Status.h>
-#include <vendor/eureka/hardware/parts/1.0/IFlashlight.h>
+#include <vendor/eureka/hardware/parts/1.0/IFlashLight.h>
 #include "jni.h"
 
 using android::sp;
@@ -13,7 +13,7 @@ using vendor::eureka::hardware::parts::V1_0::Number;
 
 extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_setFlash(
         JNIEnv* env, __unused jobject obj, jint value) {
-    android::sp<IFlashlight> service = IFlashLight::getService();
+    android::sp<IFlashLight> service = IFlashLight::getService();
     service->setFlashlightEnable(Number::ENABLE);
     switch (value) {
         case 1:
@@ -52,7 +52,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_eurekateam_samsungextras_interfaces_F
 }
 extern "C" JNIEXPORT jint JNICALL Java_com_eurekateam_samsungextras_interfaces_Flashlight_getFlash(
         JNIEnv* env, jobject clazz, jint isA10) {
-    android::sp<IFlashlight> service = IFlashLight::getService();
+    android::sp<IFlashLight> service = IFlashLight::getService();
     int ret;
     if (isA10 == 1) {
         ret = service->readFlashlightstats(Device::A10);
diff --git a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp b/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
index e4ab841..19ed3e2 100644
--- a/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
+++ b/universal7885-common/apps/SamsungParts/jni/GPUBridge.cpp
@@ -6,7 +6,7 @@
 #include "jni.h"
 
 using android::sp;
-using vendor::eureka::hardware::parts::V1_0::Enable;
+using vendor::eureka::hardware::parts::V1_0::Number;
 using vendor::eureka::hardware::parts::V1_0::IGpu;
 
 extern "C" JNIEXPORT void JNICALL
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal b/universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal
index 0dc7e36..55ff1d7 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal
+++ b/universal7885-common/interfaces/hardware/parts/1.0/IBattery.hal
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package vendor.eureka.hardware.battery@1.0;
+package vendor.eureka.hardware.parts@1.0;
 
 interface IBattery {
 	getBatteryStats(SysfsType stats) generates (int32_t result);
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal b/universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal
index 21dadb6..63a72b0 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal
+++ b/universal7885-common/interfaces/hardware/parts/1.0/IFlashLight.hal
@@ -14,7 +14,7 @@
 
 package vendor.eureka.hardware.parts@1.0;
 
-interface IFlashlight {
+interface IFlashLight {
 	setFlashlightWritable(Value value) generates (int32_t result);
 	setFlashlightEnable(Number enable) generates (int32_t result);
 	readFlashlightstats(Device device) generates (int32_t value);
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal b/universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal
index 8882c67..717f04e 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal
+++ b/universal7885-common/interfaces/hardware/parts/1.0/IGpu.hal
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package vendor.eureka.hardware.gpu@1.0;
+package vendor.eureka.hardware.parts@1.0;
 
 interface IGpu {
 	setGpuWritable(Number enable) generates (int32_t result);
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal b/universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal
index c618196..f0af70e 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal
+++ b/universal7885-common/interfaces/hardware/parts/1.0/ISELinux.hal
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package vendor.eureka.security.selinux@1.0;
+package vendor.eureka.hardware.parts@1.0;
 
 interface ISELinux {
 	setSELinuxWritable(Number enable) generates (int32_t result);
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp
index 8a325e9..1ea5f2e 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/Battery.cpp
@@ -21,7 +21,7 @@
 namespace vendor::eureka::hardware::parts::V1_0 {
 
 // Methods from ::android::hardware::battery::V1_0::IBattery follow.
-Return<int32_t> Battery::getBatteryStats(parts::V1_0::SysfsType stats) {
+Return<int32_t> IBattery::getBatteryStats(parts::V1_0::SysfsType stats) {
     std::ifstream file;
     std::string filename;
     switch (stats) {
@@ -60,7 +60,7 @@ Return<int32_t> Battery::getBatteryStats(parts::V1_0::SysfsType stats) {
     return -1;
 }
 
-Return<int32_t> Battery::setBatteryWritable(parts::V1_0::SysfsType stats,
+Return<int32_t> IBattery::setBatteryWritable(parts::V1_0::SysfsType stats,
                                             parts::V1_0::Number value) {
     std::ofstream file;
     std::string filename;
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp
index f40ee4f..047ed7e 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/FlashLight.cpp
@@ -19,7 +19,7 @@
 namespace vendor::eureka::hardware::parts::V1_0 {
 
 // Methods from ::android::hardware::parts::V1_0::IFlashLight follow.
-Return<int32_t> FlashLight::setFlashlightEnable(parts::V1_0::Number enable) {
+Return<int32_t> IFlashLight::setFlashlightEnable(parts::V1_0::Number enable) {
     std::ofstream file;
     std::string writevalue;
     switch (enable) {
@@ -39,7 +39,7 @@ Return<int32_t> FlashLight::setFlashlightEnable(parts::V1_0::Number enable) {
     return 0;
 }
 
-Return<int32_t> FlashLight::setFlashlightWritable(parts::V1_0::Value value) {
+Return<int32_t> IFlashLight::setFlashlightWritable(parts::V1_0::Value value) {
     std::ofstream file;
     std::string writevalue;
     switch (value) {
@@ -83,7 +83,7 @@ Return<int32_t> FlashLight::setFlashlightWritable(parts::V1_0::Value value) {
     return 0;
 }
 
-Return<int32_t> FlashLight::readFlashlightstats(parts::V1_0::Device device) {
+Return<int32_t> IFlashLight::readFlashlightstats(parts::V1_0::Device device) {
     std::ifstream file;
     std::string value;
     int32_t intvalue;
@@ -104,7 +104,7 @@ Return<int32_t> FlashLight::readFlashlightstats(parts::V1_0::Device device) {
     return -1;
 }
 
-IFlashlight* FlashLight::getInstance(void) {
+IFlashLight* FlashLight::getInstance(void) {
     return new FlashLight();
 }
 }  // namespace vendor::eureka::hardware::parts::V1_0
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp
index 021ef4f..2a4023a 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/Gpu.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 namespace vendor::eureka::hardware::parts::V1_0 {
 
-Return<int32_t> Gpu::setGpuWritable(parts::V1_0::Number enable) {
+Return<int32_t> IGpu::setGpuWritable(parts::V1_0::Number enable) {
     std::ofstream file;
     std::string writevalue;
     if (enable == Number::ENABLE) {
@@ -32,7 +32,7 @@ Return<int32_t> Gpu::setGpuWritable(parts::V1_0::Number enable) {
     return 0;
 }
 
-Return<int32_t> Gpu::readGpustats(void) {
+Return<int32_t> IGpu::readGpustats(void) {
     std::ifstream file;
     std::string value;
     int32_t intvalue;
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp
index ec3b1c5..12d11f5 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.cpp
@@ -18,7 +18,7 @@
 #include <sstream>
 namespace vendor::eureka::hardware::parts::V1_0 {
 
-Return<int32_t> SELinux::setSELinuxWritable(parts::V1_0::Number enable) {
+Return<int32_t> ISELinux::setSELinuxWritable(parts::V1_0::Number enable) {
     std::ofstream file;
     std::string writevalue;
     if (enable == Number::ENABLE) {
@@ -32,7 +32,7 @@ Return<int32_t> SELinux::setSELinuxWritable(parts::V1_0::Number enable) {
     return 0;
 }
 
-Return<int32_t> SELinux::readSELinuxstats(void) {
+Return<int32_t> ISELinux::readSELinuxstats(void) {
     std::ifstream file;
     std::string value;
     int32_t intvalue;
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h b/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h
index ee942d4..b544416 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/SELinux.h
@@ -30,7 +30,7 @@ using ::android::hardware::Void;
 
 struct SELinux : public ISELinux {
     // Methods from ::vendor::eureka::hardware::parts::V1_0::ISELinux follow.
-    Return<int32_t> setSELinuxWritable(Enable enable);
+    Return<int32_t> setSELinuxWritable(Number enable);
     Return<int32_t> readSELinuxstats(void);
     // Methods from ::android::hidl::base::V1_0::IBase follow.
     static ISELinux* getInstance(void);
diff --git a/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp b/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp
index f2cefe0..dcecf9f 100644
--- a/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp
+++ b/universal7885-common/interfaces/hardware/parts/1.0/default/service.cpp
@@ -22,6 +22,9 @@
 #include <hidl/LegacySupport.h>
 
 #include "Battery.h"
+#include "FlashLight.h"
+#include "Gpu.h"
+#include "SELinux.h"
 
 using android::sp;
 using android::hardware::configureRpcThreadpool;