diff --git a/Makefile b/Makefile
index 55eaf55..c3d4720 100644
--- a/Makefile
+++ b/Makefile
@@ -72,8 +72,7 @@ all-redirect: all
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o femonosd.o femonreceiver.o femonconfig.o femontools.o femonmpeg.o \
-	femonac3.o femonaac.o femonlatm.o femonh264.o femonsetup.o femonsymbol.o
+OBJS = $(PLUGIN).o aac.o ac3.o config.o h264.o latm.o mpeg.o osd.o receiver.o setup.o symbol.o tools.o
 
 ### The main target:
 
diff --git a/femonaac.c b/aac.c
similarity index 96%
rename from femonaac.c
rename to aac.c
index 04007da..9a3eab0 100644
--- a/femonaac.c
+++ b/aac.c
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * aac.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonaac.h"
+#include "tools.h"
+#include "aac.h"
 
 #define IS_HEAAC_AUDIO(buf) (((buf)[0] == 0xFF) && (((buf)[1] & 0xF6) == 0xF0))
 
diff --git a/femonaac.h b/aac.h
similarity index 67%
rename from femonaac.h
rename to aac.h
index 153e6e0..35cf24b 100644
--- a/femonaac.h
+++ b/aac.h
@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * aac.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAAC_H
-#define __FEMONAAC_H
+#ifndef __FEMON_AAC_H
+#define __FEMON_AAC_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonAAC {
 private:
@@ -23,4 +23,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONAAC_H
+#endif //__FEMON_AAC_H
diff --git a/femonac3.c b/ac3.c
similarity index 96%
rename from femonac3.c
rename to ac3.c
index 2d6d28e..211fae7 100644
--- a/femonac3.c
+++ b/ac3.c
@@ -1,13 +1,13 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * ac3.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  * AC3 Audio Header: http://www.atsc.org/standards/a_52a.pdf
  */
 
-#include "femontools.h"
-#include "femonac3.h"
+#include "tools.h"
+#include "ac3.h"
 
 int cFemonAC3::bitrateS[32] =
 {
diff --git a/femonac3.h b/ac3.h
similarity index 70%
rename from femonac3.h
rename to ac3.h
index 92b1f2c..9006541 100644
--- a/femonac3.h
+++ b/ac3.h
@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * ac3.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAC3_H
-#define __FEMONAC3_H
+#ifndef __FEMON_AC3_H
+#define __FEMON_AC3_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonAC3 {
 private:
@@ -25,4 +25,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONAC3_H
+#endif //__FEMON_AC3_H
diff --git a/femonaudio.h b/audio.h
similarity index 96%
rename from femonaudio.h
rename to audio.h
index 8c06747..e86c3b2 100644
--- a/femonaudio.h
+++ b/audio.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the AUDIO Disk Recorder
+ * audio.h: Frontend Status Monitor plugin for the AUDIO Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONAUDIO_H
-#define __FEMONAUDIO_H
+#ifndef __FEMON_AUDIO_H
+#define __FEMON_AUDIO_H
 
 enum eAudioCodec {
   AUDIO_CODEC_INVALID = -1,
@@ -147,4 +147,4 @@ public:
   virtual void SetAC3LFE(bool onoffP) = 0;
   };
 
-#endif //__FEMONAUDIO_H
+#endif //__FEMON_AUDIO_H
diff --git a/femonconfig.c b/config.c
similarity index 97%
rename from femonconfig.c
rename to config.c
index 0b112e2..6093999 100644
--- a/femonconfig.c
+++ b/config.c
@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * config.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -7,8 +7,8 @@
 
 #include <string.h>
 
-#include "femontools.h"
-#include "femonconfig.h"
+#include "tools.h"
+#include "config.h"
 
 cFemonConfig FemonConfig;
 
diff --git a/femonconfig.h b/config.h
similarity index 96%
rename from femonconfig.h
rename to config.h
index 623a466..9bddfc6 100644
--- a/femonconfig.h
+++ b/config.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * config.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONCONFIG_H
-#define __FEMONCONFIG_H
+#ifndef __FEMON_CONFIG_H
+#define __FEMON_CONFIG_H
 
 #define MaxSvdrpIp 15 // xxx.xxx.xxx.xxx
 
@@ -133,4 +133,4 @@ struct cFemonTheme
 
 extern const cFemonTheme FemonTheme[eFemonThemeMaxNumber];
 
-#endif // __FEMONCONFIG_H
+#endif // __FEMON_CONFIG_H
diff --git a/femon.c b/femon.c
index a3b1a31..91b4846 100644
--- a/femon.c
+++ b/femon.c
@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * femon.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -10,12 +10,12 @@
 #include <vdr/remote.h>
 #include <vdr/player.h>
 
-#include "femonconfig.h"
-#include "log.h"
-#include "femonosd.h"
-#include "femonsetup.h"
+#include "config.h"
 #include "femonservice.h"
-#include "femontools.h"
+#include "log.h"
+#include "osd.h"
+#include "tools.h"
+#include "setup.h"
 
 #if defined(APIVERSNUM) && APIVERSNUM < 20200
 #error "VDR-2.2.0 API version or greater is required!"
diff --git a/femonh264.c b/h264.c
similarity index 99%
rename from femonh264.c
rename to h264.c
index 06b4606..0ed474d 100644
--- a/femonh264.c
+++ b/h264.c
@@ -1,13 +1,13 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * h264.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include "log.h"
-#include "femontools.h"
-#include "femonh264.h"
+#include "tools.h"
+#include "h264.h"
 
 const cFemonH264::t_DAR cFemonH264::darS[] =
 {
diff --git a/femonh264.h b/h264.h
similarity index 90%
rename from femonh264.h
rename to h264.h
index 82203f4..3e7589f 100644
--- a/femonh264.h
+++ b/h264.h
@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * h264.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONH264_H
-#define __FEMONH264_H
+#ifndef __FEMON_H264_H
+#define __FEMON_H264_H
 
-#include "femonvideo.h"
+#include "video.h"
 
 class cFemonH264 {
 private:
@@ -61,4 +61,4 @@ public:
   bool processVideo(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONH264_H
+#endif //__FEMON_H264_H
diff --git a/femonlatm.c b/latm.c
similarity index 96%
rename from femonlatm.c
rename to latm.c
index 8931c88..b2037c6 100644
--- a/femonlatm.c
+++ b/latm.c
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * latm.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonlatm.h"
+#include "tools.h"
+#include "latm.h"
 
 int cFemonLATM::bitrateS[3][16] =
 {
diff --git a/femonlatm.h b/latm.h
similarity index 68%
rename from femonlatm.h
rename to latm.h
index 827dc35..7909264 100644
--- a/femonlatm.h
+++ b/latm.h
@@ -1,14 +1,14 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * latm.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONLATM_H
-#define __FEMONLATM_H
+#ifndef __FEMON_LATM_H
+#define __FEMON_LATM_H
 
-#include "femonaudio.h"
+#include "audio.h"
 
 class cFemonLATM {
 private:
@@ -24,4 +24,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONLATM_H
+#endif //__FEMON_LATM_H
diff --git a/log.h b/log.h
index 22b13f1..b954575 100644
--- a/log.h
+++ b/log.h
@@ -8,7 +8,7 @@
 #ifndef __FEMON_LOG_H
 #define __FEMON_LOG_H
 
-#include "femonconfig.h"
+#include "config.h"
 
 #define error(x...)   esyslog("FEMON-ERROR: " x)
 #define info(x...)    isyslog("FEMON: " x)
diff --git a/femonmpeg.c b/mpeg.c
similarity index 98%
rename from femonmpeg.c
rename to mpeg.c
index 9bfc38c..787ee36 100644
--- a/femonmpeg.c
+++ b/mpeg.c
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * mpeg.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#include "femontools.h"
-#include "femonmpeg.h"
+#include "tools.h"
+#include "mpeg.h"
 
 #define IS_EXTENSION_START(buf) (((buf)[0] == 0x00) && ((buf)[1] == 0x00) && ((buf)[2] == 0x01) && ((buf)[3] == 0xB5))
 
diff --git a/femonmpeg.h b/mpeg.h
similarity index 74%
rename from femonmpeg.h
rename to mpeg.h
index f0db8eb..3b0d8d1 100644
--- a/femonmpeg.h
+++ b/mpeg.h
@@ -1,15 +1,15 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * mpeg.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONMPEG_H
-#define __FEMONMPEG_H
+#ifndef __FEMON_MPEG_H
+#define __FEMON_MPEG_H
 
-#include "femonvideo.h"
-#include "femonaudio.h"
+#include "video.h"
+#include "audio.h"
 
 class cFemonMPEG {
 private:
@@ -28,4 +28,4 @@ public:
   bool processAudio(const uint8_t *bufP, int lenP);
   };
 
-#endif //__FEMONMPEG_H
+#endif //__FEMON_MPEG_H
diff --git a/femonosd.c b/osd.c
similarity index 99%
rename from femonosd.c
rename to osd.c
index e1006e6..7158642 100644
--- a/femonosd.c
+++ b/osd.c
@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * osd.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -12,13 +12,13 @@
 #include <ctype.h>
 #include <math.h>
 
+#include "config.h"
 #include "iptvservice.h"
-#include "femonconfig.h"
 #include "log.h"
-#include "femonreceiver.h"
-#include "femontools.h"
-#include "femonsymbol.h"
-#include "femonosd.h"
+#include "receiver.h"
+#include "symbol.h"
+#include "tools.h"
+#include "osd.h"
 
 #define CHANNELINPUT_TIMEOUT      1000
 #define SVDRPPLUGIN               "svdrpservice"
diff --git a/femonosd.h b/osd.h
similarity index 94%
rename from femonosd.h
rename to osd.h
index 2b3ea77..4428763 100644
--- a/femonosd.h
+++ b/osd.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * osd.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONOSD_H
-#define __FEMONOSD_H
+#ifndef __FEMON_OSD_H
+#define __FEMON_OSD_H
 
 #include <linux/dvb/frontend.h>
 #include <sys/time.h>
@@ -19,7 +19,7 @@
 #include <vdr/transfer.h>
 #include <vdr/tools.h>
 
-#include "femonreceiver.h"
+#include "receiver.h"
 #include "svdrpservice.h"
 
 #define MAX_BM_NUMBER 8
@@ -98,5 +98,5 @@ public:
   double  GetDolbyBitrate(void);
 };
 
-#endif //__FEMONOSD_H
+#endif //__FEMON_OSD_H
 
diff --git a/femonreceiver.c b/receiver.c
similarity index 98%
rename from femonreceiver.c
rename to receiver.c
index e0e2c18..4401dab 100644
--- a/femonreceiver.c
+++ b/receiver.c
@@ -1,15 +1,16 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * receiver.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <unistd.h>
-#include "femonconfig.h"
+
+#include "config.h"
 #include "log.h"
-#include "femontools.h"
-#include "femonreceiver.h"
+#include "tools.h"
+#include "receiver.h"
 
 cFemonReceiver::cFemonReceiver(const cChannel *channelP, int aTrackP, int dTrackP)
 : cReceiver(channelP),
diff --git a/femonreceiver.h b/receiver.h
similarity index 96%
rename from femonreceiver.h
rename to receiver.h
index b93142a..c4b5ecf 100644
--- a/femonreceiver.h
+++ b/receiver.h
@@ -1,24 +1,24 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * receiver.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONRECEIVER_H
-#define __FEMONRECEIVER_H
+#ifndef __FEMON_RECEIVER_H
+#define __FEMON_RECEIVER_H
 
 #include <vdr/thread.h>
 #include <vdr/receiver.h>
 
-#include "femonh264.h"
-#include "femonmpeg.h"
-#include "femonaac.h"
-#include "femonlatm.h"
-#include "femonac3.h"
-#include "femonaudio.h"
-#include "femonvideo.h"
-#include "femontools.h"
+#include "aac.h"
+#include "ac3.h"
+#include "audio.h"
+#include "h264.h"
+#include "latm.h"
+#include "mpeg.h"
+#include "tools.h"
+#include "video.h"
 
 class cFemonReceiver : public cReceiver, public cThread, public cFemonVideoIf, public cFemonAudioIf, public cFemonAC3If {
 private:
@@ -174,5 +174,5 @@ public:
                                       return ac3InfoM.lfe; };                 // boolean
   };
 
-#endif //__FEMONRECEIVER_H
+#endif //__FEMON_RECEIVER_H
 
diff --git a/femonsetup.c b/setup.c
similarity index 97%
rename from femonsetup.c
rename to setup.c
index aded41a..e1e94ff 100644
--- a/femonsetup.c
+++ b/setup.c
@@ -1,15 +1,16 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * setup.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <vdr/menu.h>
-#include "femonconfig.h"
+
+#include "config.h"
 #include "log.h"
-#include "femontools.h"
-#include "femonsetup.h"
+#include "tools.h"
+#include "setup.h"
 
 cMenuFemonSetup::cMenuFemonSetup()
 : hideMenuM(FemonConfig.GetHideMenu()),
diff --git a/femonsetup.h b/setup.h
similarity index 83%
rename from femonsetup.h
rename to setup.h
index 9d16358..eda3e46 100644
--- a/femonsetup.h
+++ b/setup.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * setup.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONSETUP_H
-#define __FEMONSETUP_H
+#ifndef __FEMON_SETUP_H
+#define __FEMON_SETUP_H
 
 class cMenuFemonSetup : public cMenuSetupPage {
 private:
@@ -38,4 +38,4 @@ public:
   cMenuFemonSetup();
 };
 
-#endif // __FEMONSETUP_H
+#endif // __FEMON_SETUP_H
diff --git a/femonsymbol.c b/symbol.c
similarity index 98%
rename from femonsymbol.c
rename to symbol.c
index fa75f66..618db31 100644
--- a/femonsymbol.c
+++ b/symbol.c
@@ -1,14 +1,15 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * symbol.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
 #include <vdr/device.h>
+
 #include "log.h"
-#include "femontools.h"
-#include "femonsymbol.h"
+#include "tools.h"
+#include "symbol.h"
 
 #include "symbols/stereo.xpm"
 #include "symbols/monoleft.xpm"
diff --git a/femonsymbol.h b/symbol.h
similarity index 91%
rename from femonsymbol.h
rename to symbol.h
index 4fe14c6..de8a462 100644
--- a/femonsymbol.h
+++ b/symbol.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * symbol.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONSYMBOL_H
-#define __FEMONSYMBOL_H
+#ifndef __FEMON_SYMBOL_H
+#define __FEMON_SYMBOL_H
 
 #include <vdr/tools.h>
 #include <vdr/osd.h>
@@ -84,4 +84,4 @@ public:
 
 extern cFemonSymbolCache femonSymbols;
 
-#endif // __FEMONSYMBOL_H
+#endif // __FEMON_SYMBOL_H
diff --git a/femontools.c b/tools.c
similarity index 99%
rename from femontools.c
rename to tools.c
index f209dac..3dafc52 100644
--- a/femontools.c
+++ b/tools.c
@@ -1,5 +1,5 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * tools.c: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
@@ -15,9 +15,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <linux/dvb/frontend.h>
-#include "femonreceiver.h"
-#include "femonosd.h"
-#include "femontools.h"
+
+#include "osd.h"
+#include "receiver.h"
+#include "tools.h"
 
 static cString getCA(int valueP)
 {
diff --git a/femontools.h b/tools.h
similarity index 94%
rename from femontools.h
rename to tools.h
index ceecad4..d492e41 100644
--- a/femontools.h
+++ b/tools.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * tools.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONTOOLS_H
-#define __FEMONTOOLS_H
+#ifndef __FEMON_COMMON_H
+#define __FEMON_COMMON_H
 
 #include <stdint.h>
 #include <vdr/channels.h>
@@ -80,4 +80,4 @@ public:
   void           SkipSeGolomb() { SkipGolomb(); }
   };
 
-#endif // __FEMONTOOLS_H
+#endif // __FEMON_COMMON_H
diff --git a/femonvideo.h b/video.h
similarity index 93%
rename from femonvideo.h
rename to video.h
index 1b7123f..01ff131 100644
--- a/femonvideo.h
+++ b/video.h
@@ -1,12 +1,12 @@
 /*
- * Frontend Status Monitor plugin for the Video Disk Recorder
+ * video.h: Frontend Status Monitor plugin for the Video Disk Recorder
  *
  * See the README file for copyright information and how to reach the author.
  *
  */
 
-#ifndef __FEMONVIDEO_H
-#define __FEMONVIDEO_H
+#ifndef __FEMON_VIDEO_H
+#define __FEMON_VIDEO_H
 
 enum eVideoCodec {
   VIDEO_CODEC_INVALID = -1,
@@ -90,4 +90,4 @@ public:
   virtual void SetVideoBitrate(double bitRateP) = 0;
   };
 
-#endif //__FEMONVIDEO_H
+#endif //__FEMON_VIDEO_H