diff --git a/apps/early_announce/Announcement.cpp b/apps/early_announce/EarlyAnnounce.cpp
similarity index 81%
rename from apps/early_announce/Announcement.cpp
rename to apps/early_announce/EarlyAnnounce.cpp
index c7f64c9e..bb21ebf0 100644
--- a/apps/early_announce/Announcement.cpp
+++ b/apps/early_announce/EarlyAnnounce.cpp
@@ -1,5 +1,5 @@
 /*
- * $Id: Announcement.cpp,v 1.7.8.4 2005/08/31 13:54:29 rco Exp $
+ * $Id: EarlyAnnounce.cpp,v 1.7.8.4 2005/08/31 13:54:29 rco Exp $
  *
  * Copyright (C) 2002-2003 Fhg Fokus
  *
@@ -25,7 +25,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Announcement.h"
+#include "EarlyAnnounce.h"
 #include "AmConfig.h"
 #include "AmUtils.h"
 #include "AmSessionScheduler.h"
@@ -35,17 +35,17 @@
 
 #define MOD_NAME "early_announce"
 
-EXPORT_SESSION_FACTORY(AnnouncementFactory,MOD_NAME);
+EXPORT_SESSION_FACTORY(EarlyAnnounceFactory,MOD_NAME);
 
-string AnnouncementFactory::AnnouncePath;
-string AnnouncementFactory::AnnounceFile;
+string EarlyAnnounceFactory::AnnouncePath;
+string EarlyAnnounceFactory::AnnounceFile;
 
-AnnouncementFactory::AnnouncementFactory(const string& _app_name)
+EarlyAnnounceFactory::EarlyAnnounceFactory(const string& _app_name)
   : AmSessionFactory(_app_name)
 {
 }
 
-int AnnouncementFactory::onLoad()
+int EarlyAnnounceFactory::onLoad()
 {
     AmConfigReader cfg;
     if(cfg.loadFile(AmConfig::ModConfigPath + string(MOD_NAME ".conf")))
@@ -72,7 +72,7 @@ int AnnouncementFactory::onLoad()
 }
 
 
-void AnnouncementDialog::onInvite(const AmSipRequest& req) 
+void EarlyAnnounceDialog::onInvite(const AmSipRequest& req) 
 {
     string sdp_reply;
     if(acceptAudio(req,sdp_reply)!=0)
@@ -95,7 +95,7 @@ void AnnouncementDialog::onInvite(const AmSipRequest& req)
 }
 
 
-AmSession* AnnouncementFactory::onInvite(const AmSipRequest& req)
+AmSession* EarlyAnnounceFactory::onInvite(const AmSipRequest& req)
 {
     string announce_path = AnnouncePath;
     string announce_file = announce_path + req.domain 
@@ -113,40 +113,40 @@ AmSession* AnnouncementFactory::onInvite(const AmSipRequest& req)
     announce_file = AnnouncePath + AnnounceFile;
     
 end:
-    return new AnnouncementDialog(announce_file);
+    return new EarlyAnnounceDialog(announce_file);
 }
 
-AnnouncementDialog::AnnouncementDialog(const string& filename)
+EarlyAnnounceDialog::EarlyAnnounceDialog(const string& filename)
     : filename(filename)
 {
 }
 
-AnnouncementDialog::~AnnouncementDialog()
+EarlyAnnounceDialog::~EarlyAnnounceDialog()
 {
 }
 
-void AnnouncementDialog::onSessionStart(const AmSipRequest& req)
+void EarlyAnnounceDialog::onSessionStart(const AmSipRequest& req)
 {
-    DBG("AnnouncementDialog::onSessionStart\n");
+    DBG("EarlyAnnounceDialog::onSessionStart\n");
     if(wav_file.open(filename,AmAudioFile::Read))
-	throw string("AnnouncementDialog::onSessionStart: Cannot open file\n");
+	throw string("EarlyAnnounceDialog::onSessionStart: Cannot open file\n");
     
     setOutput(&wav_file);
 }
 
-void AnnouncementDialog::onBye(const AmSipRequest& req)
+void EarlyAnnounceDialog::onBye(const AmSipRequest& req)
 {
     DBG("onBye: stopSession\n");
     setStopped();
 }
 
-void AnnouncementDialog::onCancel()
+void EarlyAnnounceDialog::onCancel()
 {
     dlg.reply(localreq,487,"Call terminated");
     setStopped();
 }
 
-void AnnouncementDialog::process(AmEvent* event)
+void EarlyAnnounceDialog::process(AmEvent* event)
 {
 
     AmAudioEvent* audio_event = dynamic_cast<AmAudioEvent*>(event);
diff --git a/apps/early_announce/Announcement.h b/apps/early_announce/EarlyAnnounce.h
similarity index 81%
rename from apps/early_announce/Announcement.h
rename to apps/early_announce/EarlyAnnounce.h
index 687c9786..259dc533 100644
--- a/apps/early_announce/Announcement.h
+++ b/apps/early_announce/EarlyAnnounce.h
@@ -1,7 +1,7 @@
 /*
- * $Id: Announcement.h,v 1.6.8.1 2005/06/01 12:00:24 rco Exp $
+ * $Id: EarlyAnnounce.h,v 1.6.8.1 2005/06/01 12:00:24 rco Exp $
  *
- * Copyright (C) 2002-2003 Fhg Fokus
+ * Copyright (C) 2006 iptel.org GmbH
  *
  * This file is part of sems, a free SIP media server.
  *
@@ -25,8 +25,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _ANNOUNCEMENT_H_
-#define _ANNOUNCEMENT_H_
+#ifndef _EarlyAnnounce_h_
+#define _EarlyAnnounce_h_
 
 #include "AmSession.h"
 #include "AmConfigReader.h"
@@ -34,27 +34,27 @@
 #include <string>
 using std::string;
 
-class AnnouncementFactory: public AmSessionFactory
+class EarlyAnnounceFactory: public AmSessionFactory
 {
 public:
     static string AnnouncePath;
     static string AnnounceFile;
 
-    AnnouncementFactory(const string& _app_name);
+    EarlyAnnounceFactory(const string& _app_name);
 
     int onLoad();
     AmSession* onInvite(const AmSipRequest& req);
 };
 
-class AnnouncementDialog : public AmSession
+class EarlyAnnounceDialog : public AmSession
 {
     AmAudioFile wav_file;
     string filename;
     AmSipRequest localreq;
     
  public:
-    AnnouncementDialog(const string& filename);
-    ~AnnouncementDialog();
+    EarlyAnnounceDialog(const string& filename);
+    ~EarlyAnnounceDialog();
 
     void onInvite(const AmSipRequest& req);
     void onSessionStart(const AmSipRequest& req);