diff --git a/app/ModulesHandleOptDialog.cpp b/app/ModulesHandleOptDialog.cpp
index 4548a93..5aa5a19 100644
--- a/app/ModulesHandleOptDialog.cpp
+++ b/app/ModulesHandleOptDialog.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "ModulesHandleOptDialog.h"
-#include "lib/ProgramOptions.h"
+#include "lib/PlaYUVerProgramOptions.h"
 #include <QWidget>
 #include <QLabel>
 #include <QVector>
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 4018123..7bb85d0 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -13,7 +13,7 @@ set(plaYUver_Lib_SRCS
     PlaYUVerStream.cpp
     # Command Parser
     PlaYUVerCmdParser.cpp
-    ProgramOptions.cpp
+    PlaYUVerProgramOptions.cpp
 )
 
 IF( USE_FFMPEG )
@@ -27,6 +27,7 @@ ENDIF()
 
 set(plaYUver_Lib_HEADERS
     PlaYUVerDefs.h
+    PlaYUVerProgramOptions.h
     PlaYUVerFrameStats.h
     PlaYUVerFrame.h
     PlaYUVerStream.h
diff --git a/lib/PlaYUVerCmdParser.cpp b/lib/PlaYUVerCmdParser.cpp
index bee40bc..b93e8f7 100644
--- a/lib/PlaYUVerCmdParser.cpp
+++ b/lib/PlaYUVerCmdParser.cpp
@@ -28,7 +28,6 @@
 #include <string>
 #include <vector>
 #include "PlaYUVerCmdParser.h"
-#include "ProgramOptions.h"
 #include "PlaYUVerFrame.h"
 
 namespace plaYUVer
diff --git a/lib/PlaYUVerCmdParser.h b/lib/PlaYUVerCmdParser.h
index 75ea8c7..8fd8584 100644
--- a/lib/PlaYUVerCmdParser.h
+++ b/lib/PlaYUVerCmdParser.h
@@ -23,7 +23,7 @@
  */
 
 #include "PlaYUVerDefs.h"
-#include "ProgramOptions.h"
+#include "PlaYUVerProgramOptions.h"
 
 namespace plaYUVer
 {
diff --git a/lib/PlaYUVerModuleIf.h b/lib/PlaYUVerModuleIf.h
index 17e030a..47261aa 100644
--- a/lib/PlaYUVerModuleIf.h
+++ b/lib/PlaYUVerModuleIf.h
@@ -28,7 +28,7 @@
 #include "PlaYUVerDefs.h"
 #include "PlaYUVerFrame.h"
 #include "PlaYUVerStream.h"
-#include "ProgramOptions.h"
+#include "PlaYUVerProgramOptions.h"
 #include <vector>
 
 namespace plaYUVer
diff --git a/lib/ProgramOptions.cpp b/lib/PlaYUVerProgramOptions.cpp
similarity index 99%
rename from lib/ProgramOptions.cpp
rename to lib/PlaYUVerProgramOptions.cpp
index a0432cb..00c4730 100644
--- a/lib/ProgramOptions.cpp
+++ b/lib/PlaYUVerProgramOptions.cpp
@@ -44,7 +44,7 @@
 #include <list>
 #include <map>
 #include <algorithm>
-#include "ProgramOptions.h"
+#include "PlaYUVerProgramOptions.h"
 
 using namespace std;
 
diff --git a/lib/ProgramOptions.h b/lib/PlaYUVerProgramOptions.h
similarity index 100%
rename from lib/ProgramOptions.h
rename to lib/PlaYUVerProgramOptions.h
diff --git a/tools/CommandLineHandle.h b/tools/CommandLineHandle.h
index afc9871..8a52177 100644
--- a/tools/CommandLineHandle.h
+++ b/tools/CommandLineHandle.h
@@ -28,7 +28,6 @@
 #include "config.h"
 #include "lib/PlaYUVerDefs.h"
 #include "lib/PlaYUVerCmdParser.h"
-#include "lib/ProgramOptions.h"
 
 namespace plaYUVer
 {