diff --git a/libopenbmc_intf/Makefile b/libopenbmc_intf/Makefile
index fe17dc9..df6ccf0 100644
--- a/libopenbmc_intf/Makefile
+++ b/libopenbmc_intf/Makefile
@@ -5,7 +5,7 @@
 SONAME=libopenbmc_intf.so
 VERSION=1
 LIBOBMC=$(SONAME).$(VERSION)
-INCLUDES=openbmc_intf.h openbmc.h gpio.h power_gpio.h
+INCLUDES=openbmc_intf.h openbmc.h gpio.h gpio_configs.h
 
 LDLIBS+=$(shell pkg-config --libs $(PACKAGE_DEPS))
 ALL_CFLAGS+=$(shell pkg-config --cflags $(PACKAGE_DEPS)) -fPIC -Werror $(CFLAGS)
@@ -18,7 +18,7 @@
 $(SONAME): $(LIBOBMC)
 	ln -sf $^ $@
 
-$(LIBOBMC): lib%.so.$(VERSION): %.o gpio.o power_gpio.o
+$(LIBOBMC): lib%.so.$(VERSION): %.o gpio.o gpio_configs.o
 	$(CC) -shared $(CFLAGS) $(LDFLAGS) -Wl,-soname,$(SONAME) \
 		-o $@ $^ $(LDLIBS)
 
diff --git a/libopenbmc_intf/power_gpio.c b/libopenbmc_intf/gpio_configs.c
similarity index 99%
rename from libopenbmc_intf/power_gpio.c
rename to libopenbmc_intf/gpio_configs.c
index a3fcc36..63c6e48 100644
--- a/libopenbmc_intf/power_gpio.c
+++ b/libopenbmc_intf/gpio_configs.c
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include "power_gpio.h"
+#include "gpio_configs.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libopenbmc_intf/power_gpio.h b/libopenbmc_intf/gpio_configs.h
similarity index 100%
rename from libopenbmc_intf/power_gpio.h
rename to libopenbmc_intf/gpio_configs.h
diff --git a/op-hostctl/control_host_obj.c b/op-hostctl/control_host_obj.c
index c0b4e12..6108467 100644
--- a/op-hostctl/control_host_obj.c
+++ b/op-hostctl/control_host_obj.c
@@ -8,7 +8,7 @@
 #include <openbmc_intf.h>
 #include <openbmc.h>
 #include <gpio.h>
-#include <power_gpio.h>
+#include <gpio_configs.h>
 
 /* ------------------------------------------------------------------------- */
 static const gchar* dbus_object_path = "/org/openbmc/control";
diff --git a/op-pwrctl/power_control_obj.c b/op-pwrctl/power_control_obj.c
index 493b588..bd0287a 100644
--- a/op-pwrctl/power_control_obj.c
+++ b/op-pwrctl/power_control_obj.c
@@ -10,7 +10,7 @@
 #include <openbmc_intf.h>
 #include <openbmc.h>
 #include <gpio.h>
-#include <power_gpio.h>
+#include <gpio_configs.h>
 
 /* ------------------------------------------------------------------------- */
 static const gchar* dbus_object_path = "/org/openbmc/control";