diff --git a/CMakeLists.txt b/CMakeLists.txt
index 97508e9..34a94c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # Prepare for changing the name to 'tidy'
 cmake_minimum_required (VERSION 2.8.8)
 
-set(LIB_NAME tidy5)
+set(LIB_NAME tidy)
 
 project (${LIB_NAME})
 
@@ -85,6 +85,7 @@ add_definitions ( -DSUPPORT_ASIAN_ENCODINGS=1 )
 add_definitions ( -DSUPPORT_ACCESSIBILITY_CHECKS=1 )
 add_definitions ( -DLIBTIDY_VERSION="${LIBTIDY_VERSION}" )
 add_definitions ( -DRELEASE_DATE="${tidy_YEAR}/${tidy_MONTH}/${tidy_DAY}" )
+add_definitions ( -DRC_NUMBER="RC1" )
 
 # Issue #188 - Support user items in platform.h
 if (TIDY_CONFIG_FILE)
@@ -122,8 +123,8 @@ set ( CFILES
         ${SRCDIR}/tagask.c       ${SRCDIR}/tmbstr.c       ${SRCDIR}/utf8.c
         ${SRCDIR}/tidylib.c      ${SRCDIR}/mappedio.c     ${SRCDIR}/gdoc.c )
 set ( HFILES
-        ${INCDIR}/platform.h     ${INCDIR}/tidy.h         ${INCDIR}/tidyenum.h
-        ${INCDIR}/buffio.h )
+        ${INCDIR}/tidyplatform.h ${INCDIR}/tidy.h         ${INCDIR}/tidyenum.h
+        ${INCDIR}/tidybuffio.h )
 set ( LIBHFILES
         ${SRCDIR}/access.h       ${SRCDIR}/attrs.h        ${SRCDIR}/attrdict.h ${SRCDIR}/charsets.h
         ${SRCDIR}/clean.h        ${SRCDIR}/config.h       ${SRCDIR}/entities.h
diff --git a/build/win64/updexe.bat b/build/win64/updexe.bat
index cc51710..94ee1dc 100644
--- a/build/win64/updexe.bat
+++ b/build/win64/updexe.bat
@@ -1,7 +1,8 @@
 @setlocal
 @REM copy the EXE into C:\MDOS, IFF changed
 @set TMPDIR=C:\MDOS
-@set TMPFIL1=tidy5.exe
+@REM v5.0.0
+@set TMPFIL1=tidy.exe
 @set TMPFIL2=tidy5.exe
 @set TMPSRC=Release\%TMPFIL1%
 @if NOT EXIST %TMPSRC% goto ERR1
@@ -13,7 +14,7 @@
 
 @call :CHKCOPY
 
-@set TMPFIL1=tidy5d.exe
+@set TMPFIL1=tidyd.exe
 @set TMPFIL2=tidy5d.exe
 @set TMPSRC=Debug\%TMPFIL1%
 @if NOT EXIST %TMPSRC% goto ERR1
diff --git a/console/tab2space.c b/console/tab2space.c
index 2cdc434..73548a7 100644
--- a/console/tab2space.c
+++ b/console/tab2space.c
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "platform.h"
+#include "tidyplatform.h"
 
 #define true       1
 #define false      0
diff --git a/console/test71.cxx b/console/test71.cxx
index 08bbff9..4e8adf8 100644
--- a/console/test71.cxx
+++ b/console/test71.cxx
@@ -9,7 +9,7 @@
 \*/
 
 #include <stdio.h>
-#include "buffio.h"
+#include "tidybuffio.h"
 #include "tidy.h"
 
 static const char *sample =
diff --git a/documentation/doxygen.cfg b/documentation/doxygen.cfg
index 3dea91f..af9710e 100644
--- a/documentation/doxygen.cfg
+++ b/documentation/doxygen.cfg
@@ -696,7 +696,7 @@ RECURSIVE              = NO
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 # Note that relative paths are relative to directory from which doxygen is run.
 
-EXCLUDE                = ../include/platform.h
+EXCLUDE                = ../include/tidyplatform.h
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/documentation/examples/example.1.c b/documentation/examples/example.1.c
index 69991ad..b4f16d5 100644
--- a/documentation/examples/example.1.c
+++ b/documentation/examples/example.1.c
@@ -1,7 +1,7 @@
 
 
 #include <tidy.h>;
-#include <buffio.h>;
+#include <tidybuffio.h>;
 #include <stdio.h>;
 #include <errno.h>;
 
diff --git a/experimental/TidyNodeIter.c b/experimental/TidyNodeIter.c
index f010d0c..db78e47 100644
--- a/experimental/TidyNodeIter.c
+++ b/experimental/TidyNodeIter.c
@@ -1,4 +1,4 @@
-#include "platform.h"
+#include "tidyplatform.h"
 #include "tidy-int.h"
 
 #include "TidyNodeIter.h"
diff --git a/include/tidy.h b/include/tidy.h
index 4ecbbfd..512b563 100755
--- a/include/tidy.h
+++ b/include/tidy.h
@@ -62,7 +62,7 @@
 
 */
 
-#include "platform.h"
+#include "tidyplatform.h"
 #include "tidyenum.h"
 
 #ifdef __cplusplus
@@ -263,7 +263,7 @@ The following is a short example program.
 
 <pre>
 \#include &lt;tidy.h&gt;
-\#include &lt;buffio.h&gt;
+\#include &lt;tidybuffio.h&gt;
 \#include &lt;stdio.h&gt;
 \#include &lt;errno.h&gt;
 
diff --git a/include/buffio.h b/include/tidybuffio.h
similarity index 97%
rename from include/buffio.h
rename to include/tidybuffio.h
index 7cacadc..3bb4dfc 100644
--- a/include/buffio.h
+++ b/include/tidybuffio.h
@@ -1,7 +1,7 @@
 #ifndef __TIDY_BUFFIO_H__
 #define __TIDY_BUFFIO_H__
 
-/** @file buffio.h - Treat buffer as an I/O stream.
+/** @file tidybuffio.h - Treat buffer as an I/O stream.
 
   (c) 1998-2007 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
@@ -11,7 +11,7 @@
 
 */
 
-#include "platform.h"
+#include "tidyplatform.h"
 #include "tidy.h"
 
 #ifdef __cplusplus
diff --git a/include/platform.h b/include/tidyplatform.h
similarity index 99%
rename from include/platform.h
rename to include/tidyplatform.h
index 0444e78..a40e0a0 100644
--- a/include/platform.h
+++ b/include/tidyplatform.h
@@ -1,7 +1,7 @@
 #ifndef __TIDY_PLATFORM_H__
 #define __TIDY_PLATFORM_H__
 
-/* platform.h -- Platform specifics
+/* tidyplatform.h -- Platform specifics
 
   (c) 1998-2008 (W3C) MIT, ERCIM, Keio University
   See tidy.h for the copyright notice.
diff --git a/src/buffio.c b/src/buffio.c
index b685930..31a29c4 100644
--- a/src/buffio.c
+++ b/src/buffio.c
@@ -9,7 +9,7 @@
 */
 
 #include "tidy.h"
-#include "buffio.h"
+#include "tidybuffio.h"
 #include "forward.h"
 
 /**************
diff --git a/src/fileio.h b/src/fileio.h
index c44afb4..a0e0df9 100644
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -11,7 +11,7 @@
 
 */
 
-#include "buffio.h"
+#include "tidybuffio.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/forward.h b/src/forward.h
index cb6ad94..2f48630 100644
--- a/src/forward.h
+++ b/src/forward.h
@@ -15,7 +15,7 @@
 
 */
 
-#include "platform.h"
+#include "tidyplatform.h"
 #include "tidy.h"
 
 /* Internal symbols are prefixed to avoid clashes with other libraries */
diff --git a/src/sprtf.h b/src/sprtf.h
index 97c9765..30dbfcc 100644
--- a/src/sprtf.h
+++ b/src/sprtf.h
@@ -27,7 +27,7 @@
 // Debug log file output
 #ifndef _SPRTF_HXX_
 #define _SPRTF_HXX_
-#include "platform.h"
+#include "tidyplatform.h"
 
 #ifdef   __cplusplus
 extern "C" {
diff --git a/src/streamio.h b/src/streamio.h
index 3afcdda..6e2d4b6 100644
--- a/src/streamio.h
+++ b/src/streamio.h
@@ -14,7 +14,7 @@
 */
 
 #include "forward.h"
-#include "buffio.h"
+#include "tidybuffio.h"
 #include "fileio.h"
 
 #ifdef __cplusplus
diff --git a/src/tmbstr.h b/src/tmbstr.h
index 678e631..260a6e3 100644
--- a/src/tmbstr.h
+++ b/src/tmbstr.h
@@ -8,7 +8,7 @@
 
 */
 
-#include "platform.h"
+#include "tidyplatform.h"
 
 #ifdef __cplusplus
 extern "C"
diff --git a/src/utf8.h b/src/utf8.h
index 2fe77a2..fe53a83 100644
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -8,8 +8,8 @@
 
 */
 
-#include "platform.h"
-#include "buffio.h"
+#include "tidyplatform.h"
+#include "tidybuffio.h"
 
 /* UTF-8 encoding/decoding support
 ** Does not convert character "codepoints", i.e. to/from 10646.
diff --git a/src/version.h b/src/version.h
index 09db29e..bb9c42e 100644
--- a/src/version.h
+++ b/src/version.h
@@ -11,7 +11,11 @@ static const char TY_(release_date)[] = RELEASE_DATE;
 static const char TY_(release_date)[] = "2015/01/22";
 #endif
 #ifdef LIBTIDY_VERSION
+#ifdef RC_NUMBER
+static const char TY_(library_version)[] = LIBTIDY_VERSION "." RC_NUMBER;
+#else
 static const char TY_(library_version)[] = LIBTIDY_VERSION;
+#endif
 #else
 static const char TY_(library_version)[] = "5.0.0";
 #endif
diff --git a/version.txt b/version.txt
index 1aa1bc6..79ea4d5 100644
--- a/version.txt
+++ b/version.txt
@@ -1,2 +1,3 @@
-4.9.37
-2015.06.24
+5.0.0
+2015.06.30
+