diff --git a/corosync/exec/Makefile b/corosync/exec/Makefile
index ab05e937..d035714a 100644
--- a/corosync/exec/Makefile
+++ b/corosync/exec/Makefile
@@ -75,21 +75,21 @@ EXEC_OBJS = $(MAIN_OBJS)
 override CFLAGS += -fPIC
 
 all:libtotem_pg.a libtotem_pg.so.2.0.0 liblogsys.a liblogsys.so.2.0.0 \
-	../lcr/lcr_ifact.o aisexec \
+	../lcr/lcr_ifact.o corosync \
 	objdb.lcrso vsf_ykd.lcrso keygen
 else
 EXEC_OBJS = $(MAIN_OBJS) $(LCR_OBJS)
-all: libtotem_pg.a liblogsys.a aisexec keygen
+all: libtotem_pg.a liblogsys.a corosync keygen
 endif
 
 
 ifeq (${OPENAIS_COMPAT}, DARWIN)
 
 objdb.lcrso: objdb.o
-	$(CC) -bundle -bundle_loader ./aisexec -bind_at_load objdb.o -o $@
+	$(CC) -bundle -bundle_loader ./corosync -bind_at_load objdb.o -o $@
 
 vsf_ykd.lcrso: vsf_ykd.o
-	$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./aisexec -bind_at_load vsf_ykd.o -o $@
+	$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ./corosync -bind_at_load vsf_ykd.o -o $@
 
 
 else
@@ -102,8 +102,8 @@ objdb.lcrso: objdb.o
 
 endif
 
-aisexec: $(EXEC_OBJS) $(EXEC_LIBS)
-	$(CC) $(EXEC_OBJS) $(EXEC_LIBS) -o aisexec $(LDFLAGS)
+corosync: $(EXEC_OBJS) $(EXEC_LIBS)
+	$(CC) $(EXEC_OBJS) $(EXEC_LIBS) -o corosync $(LDFLAGS)
 
 libtotem_pg.a: $(TOTEM_OBJS)
 	$(AR) -rc libtotem_pg.a $(TOTEM_OBJS)
@@ -135,7 +135,7 @@ openais-instantiate: openais-instantiate.o
 	$(CC) $(LDFLAGS) openais-instantiate.o -o openais-instantiate
 
 clean:
-	rm -f aisexec $(OBJS) *.o *.lcrso libtotem_pg.so* libtotem_pg.a gmon.out 
+	rm -f corosync $(OBJS) *.o *.lcrso libtotem_pg.so* libtotem_pg.a gmon.out 
 	rm -f keygen keygen.o openais-instantiate *.da *.bb *.bbg liblogsys.so* liblogsys.a
 
 depend:
diff --git a/corosync/exec/main.c b/corosync/exec/main.c
index 9b533167..a678f1d4 100644
--- a/corosync/exec/main.c
+++ b/corosync/exec/main.c
@@ -506,9 +506,9 @@ int main (int argc, char **argv)
 	if (background)
 		aisexec_tty_detach ();
 
-	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service RELEASE '%s'\n", RELEASE_VERSION);
+	log_printf (LOG_LEVEL_NOTICE, "Corosync Executive Service RELEASE '%s'\n", RELEASE_VERSION);
 	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2002-2006 MontaVista Software, Inc and contributors.\n");
-	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2006-2007 Red Hat, Inc.\n");
+	log_printf (LOG_LEVEL_NOTICE, "Copyright (C) 2006-2008 Red Hat, Inc.\n");
 
 	signal (SIGINT, sigintr_handler);
 	signal (SIGUSR2, sigusr2_handler);
@@ -520,7 +520,7 @@ int main (int argc, char **argv)
 		serialize_mutex_lock,
 		serialize_mutex_unlock);
 
-	log_printf (LOG_LEVEL_NOTICE, "AIS Executive Service: started and ready to provide service.\n");
+	log_printf (LOG_LEVEL_NOTICE, "Corosync Executive Service: started and ready to provide service.\n");
 
 	aisexec_poll_handle = poll_create (
 		serialize_mutex_lock,
@@ -536,7 +536,7 @@ int main (int argc, char **argv)
 		&objdb_p,
 		0);
 	if (res == -1) {
-		log_printf (LOG_LEVEL_ERROR, "AIS Executive couldn't open configuration object database component.\n");
+		log_printf (LOG_LEVEL_ERROR, "Corosync Executive couldn't open configuration object database component.\n");
 		openais_exit_error (AIS_DONE_OBJDB);
 	}
 
@@ -571,7 +571,7 @@ int main (int argc, char **argv)
 
 		config = (struct config_iface_ver0 *)config_p;
 		if (res == -1) {
-			log_printf (LOG_LEVEL_ERROR, "AIS Executive couldn't open configuration component '%s'\n", iface);
+			log_printf (LOG_LEVEL_ERROR, "Corosync Executive couldn't open configuration component '%s'\n", iface);
 			openais_exit_error (AIS_DONE_MAINCONFIGREAD);
 		}