5 files changed, 7 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 508e13d..1c19d91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,8 +57,8 @@ glib_marshal_prefix = _application_service_marshal
 # Library
 ##################################
 
-glib_enum_h = libappindicator/application-indicator-enum-types.h
-glib_enum_c = libappindicator/application-indicator-enum-types.c
+glib_enum_h = libappindicator/app-indicator-enum-types.h
+glib_enum_c = libappindicator/app-indicator-enum-types.c
 glib_enum_headers = $(libappindicator_headers)
 
 lib_LTLIBRARIES = \
@@ -67,7 +67,7 @@ lib_LTLIBRARIES = \
 libappindicatorincludedir=$(includedir)/libappindicator-0.1/libappindicator
 
 libappindicator_headers = \
-	$(srcdir)/libappindicator/application-indicator.h
+	$(srcdir)/libappindicator/app-indicator.h
 
 libappindicatorinclude_HEADERS = \
 	$(libappindicator_headers) \
@@ -78,7 +78,7 @@ libappindicator_la_SOURCES = \
 	$(glib_enum_c) \
 	notification-watcher-client.h \
 	notification-item-server.h \
-	libappindicator/application-indicator.c
+	libappindicator/app-indicator.c
 
 libappindicator_la_LDFLAGS = \
 	-version-info 0:0:0 \
diff --git a/src/libappindicator/application-indicator-enum-types.c.in b/src/libappindicator/app-indicator-enum-types.c.in
index dedf54c..19abc88 100644
--- a/src/libappindicator/application-indicator-enum-types.c.in
+++ b/src/libappindicator/app-indicator-enum-types.c.in
@@ -1,5 +1,5 @@
 /*** BEGIN file-header ***/
-#include "libappindicator/application-indicator-enum-types.h"
+#include "libappindicator/app-indicator-enum-types.h"
 
 /*** END file-header ***/
 
diff --git a/src/libappindicator/application-indicator-enum-types.h.in b/src/libappindicator/app-indicator-enum-types.h.in
index e037be7..e037be7 100644
--- a/src/libappindicator/application-indicator-enum-types.h.in
+++ b/src/libappindicator/app-indicator-enum-types.h.in
diff --git a/src/libappindicator/application-indicator.c b/src/libappindicator/app-indicator.c
index 74efd1e..fc2e196 100644
--- a/src/libappindicator/application-indicator.c
+++ b/src/libappindicator/app-indicator.c
@@ -5,8 +5,8 @@
 #include <dbus/dbus-glib.h>
 #include <libdbusmenu-glib/server.h>
 
-#include "libappindicator/application-indicator.h"
-#include "libappindicator/application-indicator-enum-types.h"
+#include "libappindicator/app-indicator.h"
+#include "libappindicator/app-indicator-enum-types.h"
 
 #include "notification-item-server.h"
 #include "notification-watcher-client.h"
diff --git a/src/libappindicator/application-indicator.h b/src/libappindicator/app-indicator.h
index 2e9045c..2e9045c 100644
--- a/src/libappindicator/application-indicator.h
+++ b/src/libappindicator/app-indicator.h