diff --git a/.gitignore b/.gitignore
index 709ac69..9a0bf0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,8 +41,8 @@
 /config.h.in~
 /config.log
 /config.status
-/op-host-state-manager
-/op-chassis-state-manager
+/phosphor-host-state-manager
+/phosphor-chassis-state-manager
 Makefile
 .deps
 *-libtool
diff --git a/Makefile.am b/Makefile.am
index 479df05..7e4cc20 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
 AM_DEFAULT_SOURCE_EXT = .cpp
 
 sbin_PROGRAMS = \
-	op-host-state-manager \
-	op-chassis-state-manager
+	phosphor-host-state-manager \
+	phosphor-chassis-state-manager
 
-op_host_state_manager_SOURCES = \
+phosphor_host_state_manager_SOURCES = \
 	host_state_manager.cpp \
 	xyz.openbmc_project.State.Host.cpp \
 	host_state_manager_main.cpp
 
-op_chassis_state_manager_SOURCES = \
+phosphor_chassis_state_manager_SOURCES = \
 	chassis_state_manager.cpp \
 	xyz.openbmc_project.State.Chassis.cpp \
 	chassis_state_manager_main.cpp
 
-op_host_state_manager_LDFLAGS = $(SYSTEMD_LIBS)
-op_chassis_state_manager_LDFLAGS = $(SYSTEMD_LIBS)
\ No newline at end of file
+phosphor_host_state_manager_LDFLAGS = $(SYSTEMD_LIBS)
+phosphor_chassis_state_manager_LDFLAGS = $(SYSTEMD_LIBS)
\ No newline at end of file