diff --git a/CPPDemos/CPPBuilderClassDemo/CPPBuilderClassDemo.cbproj b/CPPDemos/CPPBuilderClassDemo/CPPBuilderClassDemo.cbproj
index 2a1a74a..4b3d162 100644
--- a/CPPDemos/CPPBuilderClassDemo/CPPBuilderClassDemo.cbproj
+++ b/CPPDemos/CPPBuilderClassDemo/CPPBuilderClassDemo.cbproj
@@ -65,12 +65,6 @@
         <Cfg_2>true</Cfg_2>
         <Base>true</Base>
     </PropertyGroup>
-    <PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
-        <Cfg_2_Win64>true</Cfg_2_Win64>
-        <CfgParent>Cfg_2</CfgParent>
-        <Cfg_2>true</Cfg_2>
-        <Base>true</Base>
-    </PropertyGroup>
     <PropertyGroup Condition="'$(Base)'!=''">
         <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
         <IntermediateOutputDir>.\$(Platform)\$(Config)</IntermediateOutputDir>
@@ -105,13 +99,11 @@
         <VerInfo_Locale>1033</VerInfo_Locale>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-        <BCC_PCHName_Clang>ClassDemoPCH1.h</BCC_PCHName_Clang>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <PackageImports>adortl;appanalytics;bcbie;bcbsmp;bindcomp;bindcompdbx;bindcompfmx;bindcompvcl;bindengine;clinetsuite_103;CloudService;CustomIPTransport;dbexpress;dbrtl;dbxcds;DbxClientDriver;DbxCommonDriver;DBXInterBaseDriver;DBXMySQLDriver;DBXSqliteDriver;dsnap;dsnapcon;dsnapxml;FireDAC;FireDACADSDriver;FireDACCommon;FireDACCommonDriver;FireDACCommonODBC;FireDACIBDriver;FireDACMSAccDriver;FireDACMySQLDriver;FireDACPgDriver;FireDACSqliteDriver;fmx;fmxase;fmxdae;fmxFireDAC;fmxobj;FMXTee;FmxTeeUI;IndyCore;IndyIPClient;IndyIPCommon;IndyIPServer;IndyProtocols;IndySystem;inet;inetdb;inetdbxpress;lmdrtbar;lmdrtchart;lmdrtchartdb;lmdrtcore;lmdrtdesign;lmdrtdialog;lmdrtdocking;lmdrtelcore;lmdrteldb;lmdrtelpro;lmdrtfx;lmdrtgrid;lmdrtide;lmdrtinspector;lmdrtl;lmdrtplugin;lmdrtprint;lmdrtrtf;lmdrtrtfdb;lmdrtrtlx;lmdrtscript;lmdrtscriptimp;lmdrtsearch;lmdrtsearchdb;lmdrtshell;lmdrtstorage;lmdrtsyntax;lmdrtsys;lmdrtthemes;lmdrttools;lmdrttoolsdb;lmdrttxt;lmdrttxtdb;lmdrtweb;RESTBackendComponents;RESTComponents;rtl;soapmidas;soaprtl;soapserver;Tee;TeeDB;TeeUI;tethering;vcl;vclactnband;vcldb;vcldsnap;vclFireDAC;vclie;vclimg;VCLRESTComponents;VclSmp;vcltouch;vclwinx;vclx;xmlrtl;$(PackageImports)</PackageImports>
         <UWP_CppLogo44>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_44.png</UWP_CppLogo44>
         <UWP_CppLogo150>$(BDS)\bin\Artwork\Windows\UWP\cppreg_UwpDefault_150.png</UWP_CppLogo150>
-        <BCC_PCHName_Clang>ClassDemoPCH1.h</BCC_PCHName_Clang>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
         <VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -156,10 +148,6 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
         <BCC_UseClassicCompiler>false</BCC_UseClassicCompiler>
-        <BCC_PCHName_Clang>ClassDemoPCH1.h</BCC_PCHName_Clang>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <BCC_PCHName_Clang>ClassDemoPCH1.h</BCC_PCHName_Clang>
     </PropertyGroup>
     <ItemGroup>
         <CppCompile Include="ClassDemo.cpp">
@@ -169,7 +157,7 @@
             <BuildOrder>0</BuildOrder>
             <PCH>true</PCH>
         </PCHCompile>
-        <CppCompile Include="..\..\tgputtylib.cpp">
+        <CppCompile Include="..\..\ctgputtylib.cpp">
             <BuildOrder>3</BuildOrder>
         </CppCompile>
         <CppCompile Include="..\..\tgputtylibcbclass.cpp">
@@ -214,7 +202,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\CPPBuilderClassDemo.tds" Configuration="Debug" Class="DebugSymbols">
+                <DeployFile LocalName="..\..\Win32\Debug\CPPBuilderClassDemo.tds" Configuration="Debug" Class="DebugSymbols">
                     <Platform Name="Win32">
                         <RemoteName>CPPBuilderClassDemo.tds</RemoteName>
                         <Overwrite>true</Overwrite>
@@ -280,7 +268,7 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\CPPBuilderClassDemo.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="..\..\Win32\Debug\CPPBuilderClassDemo.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>CPPBuilderClassDemo.exe</RemoteName>
                         <Overwrite>true</Overwrite>
diff --git a/CPPDemos/Simple/simpledemo.cbproj b/CPPDemos/Simple/simpledemo.cbproj
index b0d8537..6514c5c 100644
--- a/CPPDemos/Simple/simpledemo.cbproj
+++ b/CPPDemos/Simple/simpledemo.cbproj
@@ -158,7 +158,7 @@
             <BuildOrder>0</BuildOrder>
             <PCH>true</PCH>
         </PCHCompile>
-        <CppCompile Include="..\..\tgputtylib.cpp">
+        <CppCompile Include="..\..\ctgputtylib.cpp">
             <BuildOrder>2</BuildOrder>
         </CppCompile>
         <BuildConfiguration Include="Release">
@@ -249,13 +249,13 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\simpledemo.exe" Configuration="Debug" Class="ProjectOutput">
+                <DeployFile LocalName="..\..\Win32\Debug\simpledemo.exe" Configuration="Debug" Class="ProjectOutput">
                     <Platform Name="Win32">
                         <RemoteName>simpledemo.exe</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName=".\Win32\Debug\simpledemo.tds" Configuration="Debug" Class="DebugSymbols">
+                <DeployFile LocalName="..\..\Win32\Debug\simpledemo.tds" Configuration="Debug" Class="DebugSymbols">
                     <Platform Name="Win32">
                         <RemoteName>simpledemo.tds</RemoteName>
                         <Overwrite>true</Overwrite>
diff --git a/CPPDemos/Simple/simpledemo.cpp b/CPPDemos/Simple/simpledemo.cpp
index 9f22e7d..1b1933a 100644
--- a/CPPDemos/Simple/simpledemo.cpp
+++ b/CPPDemos/Simple/simpledemo.cpp
@@ -1,7 +1,7 @@
 #pragma hdrstop
 #pragma argsused
 
-#include "tgputtylib.hpp"
+#include "ctgputtylib.h"
 
 #ifdef _WIN32
 #include <tchar.h>
diff --git a/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj b/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj
index d5554df..a9ef514 100644
--- a/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj
+++ b/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj
@@ -155,7 +155,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\tgputtylib.cpp" />
+    <ClCompile Include="..\..\ctgputtylib.cpp" />
     <ClCompile Include="..\..\tgputtylibvcclass.cpp" />
     <ClCompile Include="VCSFTPClassTest.cpp" />
   </ItemGroup>
diff --git a/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj.filters b/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj.filters
index 48771e1..f64d36b 100644
--- a/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj.filters
+++ b/CPPDemos/VCSFTPClassTest/VCSFTPClassTest.vcxproj.filters
@@ -18,10 +18,10 @@
     <ClCompile Include="VCSFTPClassTest.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\tgputtylib.cpp">
+    <ClCompile Include="..\..\tgputtylibvcclass.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\tgputtylibvcclass.cpp">
+    <ClCompile Include="..\..\ctgputtylib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/CPPDemos/VCSimpleDemo/VCSimpleDemo.cpp b/CPPDemos/VCSimpleDemo/VCSimpleDemo.cpp
index d37726e..103531f 100644
--- a/CPPDemos/VCSimpleDemo/VCSimpleDemo.cpp
+++ b/CPPDemos/VCSimpleDemo/VCSimpleDemo.cpp
@@ -2,7 +2,7 @@
 //
 
 #include <iostream>
-#include "../../tgputtylib.hpp"
+#include "../../ctgputtylib.h"
 
 int main()
 {
diff --git a/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj b/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj
index db1bb62..f9f35f8 100644
--- a/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj
+++ b/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj
@@ -153,7 +153,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\tgputtylib.cpp" />
+    <ClCompile Include="..\..\ctgputtylib.cpp" />
     <ClCompile Include="VCSimpleDemo.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj.filters b/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj.filters
index 399aad2..6b1f3f3 100644
--- a/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj.filters
+++ b/CPPDemos/VCSimpleDemo/VCSimpleDemo.vcxproj.filters
@@ -18,7 +18,7 @@
     <ClCompile Include="VCSimpleDemo.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\tgputtylib.cpp">
+    <ClCompile Include="..\..\ctgputtylib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/README.md b/README.md
index 0172c61..d914db5 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ tgputtysftp.pas        -   Delphi SFTP Client Class (using 8-bit strings)
 
 tgputtysftpclient.pas  -   Delphi SFTP Client Component (using UnicodeStrings)
 
-tgputtylib.cpp,hpp     -   C++ DLL bindings
+ctgputtylib.cpp,h      -   C++ DLL bindings
 
 tgputtylibcbclass.cpp,hpp  -  C++ Builder SFTP Client Class
 
diff --git a/Win32/Debug/CPPBuilderClassDemo.exe b/Win32/Debug/CPPBuilderClassDemo.exe
index d828d72..ddc4784 100644
Binary files a/Win32/Debug/CPPBuilderClassDemo.exe and b/Win32/Debug/CPPBuilderClassDemo.exe differ
diff --git a/Win32/Debug/VCSFTPClassTest.exe b/Win32/Debug/VCSFTPClassTest.exe
index 7b41c12..eb4515f 100644
Binary files a/Win32/Debug/VCSFTPClassTest.exe and b/Win32/Debug/VCSFTPClassTest.exe differ
diff --git a/Win32/Debug/simpledemo.exe b/Win32/Debug/simpledemo.exe
index 081d7cc..7f55812 100644
Binary files a/Win32/Debug/simpledemo.exe and b/Win32/Debug/simpledemo.exe differ
diff --git a/Win64/Debug/VCSimpleDemo.exe b/Win64/Debug/VCSimpleDemo.exe
index b3e62d9..7fafe5e 100644
Binary files a/Win64/Debug/VCSimpleDemo.exe and b/Win64/Debug/VCSimpleDemo.exe differ
diff --git a/tgputtylib.cpp b/ctgputtylib.cpp
similarity index 97%
rename from tgputtylib.cpp
rename to ctgputtylib.cpp
index 94d197b..b6a6471 100644
--- a/tgputtylib.cpp
+++ b/ctgputtylib.cpp
@@ -1,10 +1,6 @@
-#pragma hdrstop
-
 #include <stdio.h>
 #include <windows.h>
-#include "tgputtylib.hpp"
-
-#pragma package(smart_init)
+#include "ctgputtylib.h"
 
 HINSTANCE hPuttyLib = NULL;
 
diff --git a/tgputtylib.hpp b/ctgputtylib.h
similarity index 100%
rename from tgputtylib.hpp
rename to ctgputtylib.h
diff --git a/tgputtylibcbclass.h b/tgputtylibcbclass.h
index a66cec3..7e7d104 100644
--- a/tgputtylibcbclass.h
+++ b/tgputtylibcbclass.h
@@ -2,7 +2,7 @@
 #define tgputtylibcbclassH
 
 #include <string>
-#include "tgputtylib.hpp"
+#include "ctgputtylib.h"
 
 
 typedef void (__closure *TOnMessage)(const char *Msg, const bool isstderr);
diff --git a/tgputtylibvcclass.h b/tgputtylibvcclass.h
index aeab708..e6a12d7 100644
--- a/tgputtylibvcclass.h
+++ b/tgputtylibvcclass.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <stdexcept>
 #include <functional>
-#include "tgputtylib.hpp"
+#include "ctgputtylib.h"
 
 
 typedef std::function<void(const char* Msg, const bool isstderr)> TOnMessage;