diff --git a/ZRCola/ZRCola.rc b/ZRCola/ZRCola.rc
index 9cff780..25e65be 100644
Binary files a/ZRCola/ZRCola.rc and b/ZRCola/ZRCola.rc differ
diff --git a/ZRCola/zrcolaabout.cpp b/ZRCola/zrcolaabout.cpp
index 97b7ffa..ecd1573 100644
--- a/ZRCola/zrcolaabout.cpp
+++ b/ZRCola/zrcolaabout.cpp
@@ -26,7 +26,7 @@
 
 wxZRColaAbout::wxZRColaAbout(wxWindow* parent) : wxZRColaAboutBase(parent)
 {
-    m_staticTextVersion->SetLabelText(wxT(ZRCOLA_VERSION_STR));
+    m_staticTextVersion->SetLabelText(wxT(PRODUCT_VERSION_STR));
 
-    m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(ZRCOLA_BUILD_YEAR_STR)));
+    m_staticTextCopyright->SetLabelText(wxString::Format(_("© 2004-%s ZRC SAZU"), wxT(PRODUCT_BUILD_YEAR_STR)));
 }
diff --git a/ZRCola/zrcolaapp.cpp b/ZRCola/zrcolaapp.cpp
index 83e8133..cb11d3d 100644
--- a/ZRCola/zrcolaapp.cpp
+++ b/ZRCola/zrcolaapp.cpp
@@ -43,12 +43,12 @@ bool ZRColaApp::OnInit()
     // To compensate migration to non-advertised shortcut, do the Microsoft Installer's feature completeness check manually.
     // If execution got this far in the first place (EXE and dependent DLLs are present and loadable).
     // Furthermore, this increments program usage counter.
-    if (::MsiQueryFeatureState(_T(ZRCOLA_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN)
-        ::MsiUseFeature(_T(ZRCOLA_VERSION_GUID), _T("featZRCola"));
+    if (::MsiQueryFeatureState(_T(PRODUCT_VERSION_GUID), _T("featZRCola")) != INSTALLSTATE_UNKNOWN)
+        ::MsiUseFeature(_T(PRODUCT_VERSION_GUID), _T("featZRCola"));
 #endif
 
     // Initialize configuration.
-    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR)));
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR)));
     if (cfgPrev) wxDELETE(cfgPrev);
 
     if (!wxApp::OnInit())
@@ -65,7 +65,7 @@ bool ZRColaApp::OnInit()
 
 #ifdef __WXMSW__
     // Create global event.
-    m_running.attach(::CreateEvent(NULL, FALSE, FALSE, _T(ZRCOLA_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}")));
+    m_running.attach(::CreateEvent(NULL, FALSE, FALSE, _T(PRODUCT_CFG_APPLICATION) _T("{BBDE7AAD-29B6-4B83-ADA1-92AFA81A0883}")));
     if (::GetLastError() == ERROR_ALREADY_EXISTS) {
         // ZRCola is already running. Find its window.
         HWND okno = ::FindWindow(_T("wxWindowNR"), _("ZRCola"));
diff --git a/ZRCola/zrcolafrm.cpp b/ZRCola/zrcolafrm.cpp
index b8a31e3..46ffa57 100644
--- a/ZRCola/zrcolafrm.cpp
+++ b/ZRCola/zrcolafrm.cpp
@@ -358,7 +358,7 @@ void wxZRColaFrame::OnHelpShortcuts(wxCommandEvent& event)
 
 #ifdef __WXMSW__
     // Search and try to launch installed PDF.
-    INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(ZRCOLA_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
+    INSTALLSTATE pdf_is = ::MsiGetComponentPath(_T(PRODUCT_VERSION_GUID), _T("{68AC2C38-10E2-41A3-B92C-844C03FFDF6A}"), pdf_path);
     if ((pdf_is == INSTALLSTATE_LOCAL || pdf_is == INSTALLSTATE_SOURCE) &&
         wxFileExists(pdf_path) &&
         (int)::ShellExecute(GetHWND(), NULL, pdf_path.c_str(), NULL, NULL, SW_SHOWNORMAL) > 32) return;
diff --git a/ZRColaCompile/ZRColaCompile.rc b/ZRColaCompile/ZRColaCompile.rc
index a8e3487..b0c95a7 100644
Binary files a/ZRColaCompile/ZRColaCompile.rc and b/ZRColaCompile/ZRColaCompile.rc differ
diff --git a/ZRColaCompile/main.cpp b/ZRColaCompile/main.cpp
index acfd1f1..bed2081 100644
--- a/ZRColaCompile/main.cpp
+++ b/ZRColaCompile/main.cpp
@@ -88,7 +88,7 @@ int _tmain(int argc, _TCHAR *argv[])
     }
 
     // Initialize configuration.
-    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(ZRCOLA_CFG_APPLICATION), wxT(ZRCOLA_CFG_VENDOR)));
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_CFG_APPLICATION), wxT(PRODUCT_CFG_VENDOR)));
     if (cfgPrev) wxDELETE(cfgPrev);
 
     // Initialize locale.
diff --git a/ZRColaInstall/ZRColaInstall.rc b/ZRColaInstall/ZRColaInstall.rc
index c20df64..a1f7588 100644
Binary files a/ZRColaInstall/ZRColaInstall.rc and b/ZRColaInstall/ZRColaInstall.rc differ
diff --git a/include/UpdaterCfg.h b/include/UpdaterCfg.h
index 3d1bbc5..c087ef5 100644
--- a/include/UpdaterCfg.h
+++ b/include/UpdaterCfg.h
@@ -28,9 +28,9 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define UPDATER_PRODUCT_VERSION     ZRCOLA_VERSION
+#define UPDATER_PRODUCT_VERSION     PRODUCT_VERSION
 
 //
 // Human readable product version and build year for UI
 //
-#define UPDATER_PRODUCT_VERSION_STR ZRCOLA_VERSION_STR
+#define UPDATER_PRODUCT_VERSION_STR PRODUCT_VERSION_STR
diff --git a/include/version.h b/include/version.h
index 7476c1f..134e36c 100644
--- a/include/version.h
+++ b/include/version.h
@@ -23,7 +23,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define ZRCOLA_VERSION          0x01ff1400
+#define PRODUCT_VERSION          0x01ff1400
 
 //
 // Product version by components
@@ -31,31 +31,31 @@
 // thus we need to specify major, minor and other version components
 // separately.
 //
-#define ZRCOLA_VERSION_MAJ      1
-#define ZRCOLA_VERSION_MIN      255
-#define ZRCOLA_VERSION_REV      20
-#define ZRCOLA_VERSION_BUILD    0
+#define PRODUCT_VERSION_MAJ      1
+#define PRODUCT_VERSION_MIN      255
+#define PRODUCT_VERSION_REV      20
+#define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define ZRCOLA_VERSION_STR      "2.0-beta11"
-#define ZRCOLA_BUILD_YEAR_STR   "2016"
+#define PRODUCT_VERSION_STR      "2.0-beta11"
+#define PRODUCT_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define ZRCOLA_VERSION_INST     "1.255.20"
+#define PRODUCT_VERSION_INST     "1.255.20"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define ZRCOLA_VERSION_GUID     "{C949BB90-B6B2-4268-95DA-0C4533595E1A}"
+#define PRODUCT_VERSION_GUID     "{C949BB90-B6B2-4268-95DA-0C4533595E1A}"
 
 //
 // The product vendor and application name for configuration keeping.
 //
-#define ZRCOLA_CFG_VENDOR       "Amebis"
-#define ZRCOLA_CFG_APPLICATION  "ZRCola"
+#define PRODUCT_CFG_VENDOR       "Amebis"
+#define PRODUCT_CFG_APPLICATION  "ZRCola"
diff --git a/lib/libZRCola/res/libZRCola.rc b/lib/libZRCola/res/libZRCola.rc
index d14dab3..3786723 100644
Binary files a/lib/libZRCola/res/libZRCola.rc and b/lib/libZRCola/res/libZRCola.rc differ
diff --git a/lib/libZRColaUI/res/libZRColaUI.rc b/lib/libZRColaUI/res/libZRColaUI.rc
index 8403e2b..8f765b8 100644
Binary files a/lib/libZRColaUI/res/libZRColaUI.rc and b/lib/libZRColaUI/res/libZRColaUI.rc differ