diff --git a/hidl/power-libperfmgr/Android.bp b/hidl/power-libperfmgr/Android.bp
index 7874d10b..e13140d3 100644
--- a/hidl/power-libperfmgr/Android.bp
+++ b/hidl/power-libperfmgr/Android.bp
@@ -14,16 +14,16 @@
 // limitations under the License.
 
 cc_library_headers {
-    name: "pixel_power_headers",
+    name: "samsung_power_headers",
     vendor_available: true,
     export_include_dirs: ["."],
 }
 
 cc_binary {
-    name: "android.hardware.power@1.3-service.pixel-libperfmgr",
+    name: "android.hardware.power@1.3-service.samsung-libperfmgr",
     relative_install_path: "hw",
-    vintf_fragments: ["android.hardware.power@1.3-service.pixel.xml"],
-    init_rc: ["android.hardware.power@1.3-service.pixel-libperfmgr.rc"],
+    vintf_fragments: ["android.hardware.power@1.3-service.samsung.xml"],
+    init_rc: ["android.hardware.power@1.3-service.samsung-libperfmgr.rc"],
     srcs: ["service.cpp", "Power.cpp", "InteractionHandler.cpp",
             "display-helper.cpp"],
     cflags: [
diff --git a/hidl/power-libperfmgr/InteractionHandler.cpp b/hidl/power-libperfmgr/InteractionHandler.cpp
index da6a9173..74bdd696 100644
--- a/hidl/power-libperfmgr/InteractionHandler.cpp
+++ b/hidl/power-libperfmgr/InteractionHandler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.power@1.3-service.pixel-libperfmgr"
+#define LOG_TAG "android.hardware.power@1.3-service.samsung-libperfmgr"
 #define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL)
 
 #include <fcntl.h>
diff --git a/hidl/power-libperfmgr/Power.cpp b/hidl/power-libperfmgr/Power.cpp
index f199bfb2..a0c13080 100644
--- a/hidl/power-libperfmgr/Power.cpp
+++ b/hidl/power-libperfmgr/Power.cpp
@@ -15,7 +15,7 @@
  */
 
 #define ATRACE_TAG (ATRACE_TAG_POWER | ATRACE_TAG_HAL)
-#define LOG_TAG "android.hardware.power@1.3-service.pixel-libperfmgr"
+#define LOG_TAG "android.hardware.power@1.3-service.samsung-libperfmgr"
 
 #include <android-base/file.h>
 #include <android-base/logging.h>
diff --git a/hidl/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc b/hidl/power-libperfmgr/android.hardware.power@1.3-service.samsung-libperfmgr.rc
similarity index 96%
rename from hidl/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
rename to hidl/power-libperfmgr/android.hardware.power@1.3-service.samsung-libperfmgr.rc
index 6179f6e1..f24fb2be 100644
--- a/hidl/power-libperfmgr/android.hardware.power@1.3-service.pixel-libperfmgr.rc
+++ b/hidl/power-libperfmgr/android.hardware.power@1.3-service.samsung-libperfmgr.rc
@@ -1,4 +1,4 @@
-service vendor.power-hal-1-3 /vendor/bin/hw/android.hardware.power@1.3-service.pixel-libperfmgr
+service vendor.power-hal-1-3 /vendor/bin/hw/android.hardware.power@1.3-service.samsung-libperfmgr
     class hal
     user root
     group system
diff --git a/hidl/power-libperfmgr/android.hardware.power@1.3-service.pixel.xml b/hidl/power-libperfmgr/android.hardware.power@1.3-service.samsung.xml
similarity index 100%
rename from hidl/power-libperfmgr/android.hardware.power@1.3-service.pixel.xml
rename to hidl/power-libperfmgr/android.hardware.power@1.3-service.samsung.xml
diff --git a/hidl/power-libperfmgr/display-helper.cpp b/hidl/power-libperfmgr/display-helper.cpp
index 2369c631..76154bce 100644
--- a/hidl/power-libperfmgr/display-helper.cpp
+++ b/hidl/power-libperfmgr/display-helper.cpp
@@ -15,7 +15,7 @@
  */
 
 #define LOG_NIDEBUG 0
-#define LOG_TAG "android.hardware.power@1.3-service.pixel-libperfmgr"
+#define LOG_TAG "android.hardware.power@1.3-service.samsung-libperfmgr"
 
 #include <dlfcn.h>
 #include <errno.h>
diff --git a/hidl/power-libperfmgr/service.cpp b/hidl/power-libperfmgr/service.cpp
index 7bcc9078..e3347746 100644
--- a/hidl/power-libperfmgr/service.cpp
+++ b/hidl/power-libperfmgr/service.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#define LOG_TAG "android.hardware.power@1.3-service.pixel-libperfmgr"
+#define LOG_TAG "android.hardware.power@1.3-service.samsung-libperfmgr"
 
 #include <android/log.h>
 #include <hidl/HidlTransportSupport.h>
@@ -34,7 +34,7 @@ using android::hardware::power::V1_3::IPower;
 using android::hardware::power::V1_3::implementation::Power;
 
 int main(int /* argc */, char ** /* argv */) {
-    ALOGI("Power HAL Service 1.3 for Pixel is starting.");
+    ALOGI("Power HAL Service 1.3 for Samsung is starting.");
 
     android::sp<IPower> service = new Power();
     if (service == nullptr) {