diff --git a/Makefile.am b/Makefile.am
index a06e29d..a7a3877 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,19 @@
 AUTOMAKE_OPTIONS = foreign
 
-sbin_PROGRAMS = console-server
-bin_PROGRAMS = console-client
+sbin_PROGRAMS = obmc-console-server
+bin_PROGRAMS = obmc-console-client
 
 check_PROGRAMS = config-test
 
 AM_CFLAGS = -Wall -Wextra -Werror
 
-EXTRA_DIST = openbmc-console.conf.sample
+EXTRA_DIST = obmc-console.conf.sample
 
-console_server_CPPFLAGS = -DLOCALSTATEDIR=\"$(localstatedir)\" \
-			  -DSYSCONFDIR=\"$(sysconfdir)\"
+obmc_console_server_CPPFLAGS = \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\"
 
-console_server_SOURCES = \
+obmc_console_server_SOURCES = \
 	 console-server.c \
 	 console-server.h \
 	 util.c \
@@ -20,7 +21,7 @@
 	 log-handler.c \
 	 socket-handler.c
 
-console_client_SOURCES = \
+obmc_console_client_SOURCES = \
 	 console-client.c \
 	 console-server.h \
 	 util.c
diff --git a/config.c b/config.c
index 02bc735..fdfcb42 100644
--- a/config.c
+++ b/config.c
@@ -11,7 +11,7 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 
-static const char *config_default_filename = SYSCONFDIR "/openbmc-console.conf";
+static const char *config_default_filename = SYSCONFDIR "/obmc-console.conf";
 
 struct config_item {
 	char			*name;
diff --git a/configure.ac b/configure.ac
index c11fa03..7ed08b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # initialisation
-AC_INIT([openbmc-console], 0.1, [Jeremy Kerr <jk@ozlabs.org>])
+AC_INIT([obmc-console], 0.1, [Jeremy Kerr <jk@ozlabs.org>])
 AM_INIT_AUTOMAKE
 AM_SILENT_RULES([yes])
 
diff --git a/log-handler.c b/log-handler.c
index 79c3a1a..2478597 100644
--- a/log-handler.c
+++ b/log-handler.c
@@ -24,7 +24,7 @@
 };
 
 
-static const char *default_filename = LOCALSTATEDIR "/log/openbmc-console.log";
+static const char *default_filename = LOCALSTATEDIR "/log/obmc-console.log";
 
 static const size_t logsize = 16 * 1024;
 
diff --git a/openbmc-console.conf.sample b/obmc-console.conf.sample
similarity index 100%
rename from openbmc-console.conf.sample
rename to obmc-console.conf.sample