windows renaming to freetdm changes

git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@977 a93c3328-9c30-0410-af19-c9cd2b2d52af
2010-01-15 21:43:41 +00:00 · 2010-01-15 21:43:41 +00:00 · ac7c608620
parent d7018dcd5b
commit ac7c608620
22 changed files with 5097 additions and 5097 deletions
--- a/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="mod_openzap"
+	Name="mod_freetdm"
 	ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"
-	RootNamespace="mod_openzap"
+	RootNamespace="mod_freetdm"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@ -68,7 +68,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_freetdm.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@ -76,7 +76,7 @@
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -147,7 +147,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_freetdm.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@ -158,7 +158,7 @@
 				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -233,7 +233,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_freetdm.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@ -241,7 +241,7 @@
 				SubSystem="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@ -313,7 +313,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="FreeSwitchCore.lib"
-				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_openzap.dll"
+				OutputFile="$(SolutionDir)$(OutDir)/mod/mod_freetdm.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@ -324,7 +324,7 @@
 				LinkTimeCodeGeneration="1"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@ -359,7 +359,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\mod_openzap.c"
+				RelativePath=".\mod_freetdm.c"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/mod_freetdm/mod_freetdm.c
+++ b/libs/freetdm/mod_freetdm/mod_freetdm.c
@ -2891,7 +2891,7 @@ SWITCH_STANDARD_API(ft_function)
 		}

 	} else if (!strcasecmp(argv[0], "gains")) {
-		int i = 0;
+		unsigned int i = 0;
 		float txgain = 0.0;
 		float rxgain = 0.0;
 		uint32_t chan_id = 0;
--- a/libs/freetdm/mod_freetdm/mod_openzap.2005.vcproj
+++ b/libs/freetdm/mod_freetdm/mod_openzap.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="mod_openzap"
+	Name="mod_freetdm"
 	ProjectGUID="{FE3540C5-3303-46E0-A69E-D92F775687F1}"
-	RootNamespace="mod_openzap"
+	RootNamespace="mod_freetdm"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@ -70,7 +70,7 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -153,7 +153,7 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				LinkTimeCodeGeneration="1"
-				ImportLibrary="$(OutDir)/mod_openzap.lib"
+				ImportLibrary="$(OutDir)/mod_freetdm.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -191,7 +191,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\mod_openzap.c"
+				RelativePath=".\mod_freetdm.c"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/msvc/freetdm.2008.vcproj
+++ b/libs/freetdm/msvc/freetdm.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="openzap"
+	Name="freetdm"
 	ProjectGUID="{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"
-	RootNamespace="openzap"
+	RootNamespace="freetdm"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@ -25,7 +25,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -101,7 +101,7 @@
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -121,7 +121,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="false"
 				RuntimeTypeInfo="false"
@ -172,7 +172,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -194,7 +194,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -250,7 +250,7 @@
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -271,7 +271,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="false"
 				RuntimeTypeInfo="false"
@ -359,7 +359,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\openzap.h"
+				RelativePath="..\src\include\freetdm.h"
 				>
 			</File>
 			<File
@ -367,23 +367,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_buffer.h"
+				RelativePath="..\src\include\ftdm_buffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_config.h"
+				RelativePath="..\src\include\ftdm_config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_dso.h"
+				RelativePath="..\src\include\ftdm_dso.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_threadmutex.h"
+				RelativePath="..\src\include\ftdm_threadmutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_types.h"
+				RelativePath="..\src\include\ftdm_types.h"
 				>
 			</File>
 		</Filter>
@ -421,31 +421,31 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_buffer.c"
+				RelativePath="..\src\ftdm_buffer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_callerid.c"
+				RelativePath="..\src\ftdm_callerid.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_config.c"
+				RelativePath="..\src\ftdm_config.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_dso.c"
+				RelativePath="..\src\ftdm_dso.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_io.c"
+				RelativePath="..\src\ftdm_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_queue.c"
+				RelativePath="..\src\ftdm_queue.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_threadmutex.c"
+				RelativePath="..\src\ftdm_threadmutex.c"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/msvc/openzap.2005.vcproj
+++ b/libs/freetdm/msvc/openzap.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="openzap"
+	Name="freetdm"
 	ProjectGUID="{93B8812C-3EC4-4F78-8970-FFBFC99E167D}"
-	RootNamespace="openzap"
+	RootNamespace="freetdm"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@ -21,7 +21,7 @@
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			CharacterSet="2"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -99,7 +99,7 @@
 			ConfigurationType="2"
 			CharacterSet="2"
 			WholeProgramOptimization="1"
-			BuildLogFile="$(IntDir)\BuildLog-openzap.htm"
+			BuildLogFile="$(IntDir)\BuildLog-freetdm.htm"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@ -119,7 +119,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="../src/include;../src/isdn/include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;OPENZAP_EXPORTS;TELETONE_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FREETDM_EXPORTS;TELETONE_EXPORTS"
 				RuntimeLibrary="2"
 				DisableLanguageExtensions="false"
 				RuntimeTypeInfo="false"
@ -205,27 +205,27 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_buffer.c"
+				RelativePath="..\src\ftdm_buffer.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_callerid.c"
+				RelativePath="..\src\ftdm_callerid.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_config.c"
+				RelativePath="..\src\ftdm_config.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_dso.c"
+				RelativePath="..\src\ftdm_dso.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_io.c"
+				RelativePath="..\src\ftdm_io.c"
 				>
 			</File>
 			<File
-				RelativePath="..\src\zap_threadmutex.c"
+				RelativePath="..\src\ftdm_threadmutex.c"
 				>
 			</File>
 		</Filter>
@ -267,7 +267,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\openzap.h"
+				RelativePath="..\src\include\freetdm.h"
 				>
 			</File>
 			<File
@ -275,23 +275,23 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_buffer.h"
+				RelativePath="..\src\include\ftdm_buffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_config.h"
+				RelativePath="..\src\include\ftdm_config.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_dso.h"
+				RelativePath="..\src\include\ftdm_dso.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_threadmutex.h"
+				RelativePath="..\src\include\ftdm_threadmutex.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\include\zap_types.h"
+				RelativePath="..\src\include\ftdm_types.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/msvc/testboost/testboost.2008.vcproj
+++ b/libs/freetdm/msvc/testboost/testboost.2008.vcproj
@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\..\debug\openzap.lib"
+				AdditionalDependencies="..\..\debug\freetdm.lib"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@ -592,7 +592,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_load_tones(ftdm_span_t *span, const char *ma
 static void reset_gain_table(unsigned char *gain_table, float new_gain, ftdm_codec_t codec_gain)
 {
 	/* sample value */
-	unsigned sv = 0;
+	unsigned char sv = 0;
 	/* linear gain factor */
 	float lingain = 0;
 	/* linear value for each table sample */
@ -615,10 +615,10 @@ static void reset_gain_table(unsigned char *gain_table, float new_gain, ftdm_cod
 	}

 	/* use the 20log rule to increase the gain: http://en.wikipedia.org/wiki/Gain, http:/en.wipedia.org/wiki/20_log_rule#Definitions */
-	lingain = pow(10.0, new_gain/ 20.0);
+	lingain = (float)pow(10.0, new_gain/ 20.0);
 	for (sv = 0; sv < FTDM_GAINS_TABLE_SIZE; sv++) {
 		/* get the linear value for this alaw/ulaw sample value */
-		linvalue = codec_gain == FTDM_CODEC_ALAW ? alaw_to_linear(sv) : ulaw_to_linear(sv);
+		linvalue = codec_gain == FTDM_CODEC_ALAW ? (float)alaw_to_linear(sv) : (float)ulaw_to_linear(sv);

 		/* multiply the linear value and the previously calculated linear gain */
 		ampvalue = (int)(linvalue * lingain);
@ -637,7 +637,7 @@ static void reset_gain_table(unsigned char *gain_table, float new_gain, ftdm_cod

 FT_DECLARE(ftdm_status_t) ftdm_span_add_channel(ftdm_span_t *span, ftdm_socket_t sockfd, ftdm_chan_type_t type, ftdm_channel_t **chan)
 {
-	unsigned i = 0;
+	unsigned char i = 0;
 	if (span->chan_count < FTDM_MAX_CHANNELS_SPAN) {
 		ftdm_channel_t *new_chan = span->channels[++span->chan_count];

@ -3152,7 +3152,7 @@ FT_DECLARE(ftdm_status_t) ftdm_span_start(ftdm_span_t *span)

 FT_DECLARE(ftdm_status_t) ftdm_channel_add_to_group(const char* name, ftdm_channel_t* ftdmchan)
 {
-	int i;
+	unsigned int i;
 	ftdm_group_t* group = NULL;
 	
 	ftdm_mutex_lock(globals.group_mutex);
@ -3163,7 +3163,7 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_add_to_group(const char* name, ftdm_chann
 	}

 	/*verify that group does not already include this channel first */
-	for(i=0; i < group->chan_count; i++) {
+	for(i = 0; i < group->chan_count; i++) {
 		if (group->channels[i]->physical_span_id == ftdmchan->physical_span_id &&
 				group->channels[i]->physical_chan_id == ftdmchan->physical_chan_id) {

@ -3185,9 +3185,9 @@ FT_DECLARE(ftdm_status_t) ftdm_channel_add_to_group(const char* name, ftdm_chann

 FT_DECLARE(ftdm_status_t) ftdm_channel_remove_from_group(ftdm_group_t* group, ftdm_channel_t* ftdmchan)
 {
+	unsigned int i, j;
 	//Need to test this function
 	ftdm_mutex_lock(globals.group_mutex);
-	int i, j;

 	for (i=0; i < group->chan_count; i++) {
 			if (group->channels[i]->physical_span_id == ftdmchan->physical_span_id &&
--- a/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ftmod_analog.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_analog"
+	Name="ftmod_analog"
 	ProjectGUID="{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
-	RootNamespace="ozmod_analog"
+	RootNamespace="ftmod_analog"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -121,7 +121,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -197,7 +197,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -274,7 +274,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -333,7 +333,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="ozmod_analog.c"
+				RelativePath="ftmod_analog.c"
 				>
 			</File>
 		</Filter>
@ -343,7 +343,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="zap_analog.h"
+				RelativePath="ftdm_analog.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_analog/ozmod_analog.2005.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog/ozmod_analog.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ozmod_analog"
+	Name="ftmod_analog"
 	ProjectGUID="{37C94798-6E33-4B4F-8EE0-C72A7DC91157}"
-	RootNamespace="ozmod_analog"
+	RootNamespace="ftmod_analog"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -120,7 +120,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -182,7 +182,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="ozmod_analog.c"
+				RelativePath="ftmod_analog.c"
 				>
 			</File>
 		</Filter>
@ -192,7 +192,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="zap_analog.h"
+				RelativePath="ftdm_analog.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ftmod_analog_em.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_analog_em"
+	Name="ftmod_analog_em"
 	ProjectGUID="{B3F49375-2834-4937-9D8C-4AC2EC911010}"
-	RootNamespace="ozmod_analog_em"
+	RootNamespace="ftmod_analog_em"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -121,7 +121,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -197,7 +197,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -274,7 +274,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -333,7 +333,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="ozmod_analog_em.c"
+				RelativePath="ftmod_analog_em.c"
 				>
 			</File>
 		</Filter>
@ -343,7 +343,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="zap_analog_em.h"
+				RelativePath="ftdm_analog_em.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_analog_em/ozmod_analog_em.2005.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_analog_em/ozmod_analog_em.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ozmod_analog_em"
+	Name="ftmod_analog_em"
 	ProjectGUID="{C539D7C8-26A8-4A94-B938-77672165C130}"
-	RootNamespace="ozmod_analog_em"
+	RootNamespace="ftmod_analog_em"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -120,7 +120,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ANALOG_EM_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ANALOG_EM_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -182,7 +182,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="ozmod_analog_em.c"
+				RelativePath="ftmod_analog_em.c"
 				>
 			</File>
 		</Filter>
@ -192,7 +192,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="zap_analog_em.h"
+				RelativePath="ftdm_analog_em.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ftmod_isdn.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_isdn"
+	Name="ftmod_isdn"
 	ProjectGUID="{729344A5-D5E9-434D-8EE8-AF8C6C795D15}"
-	RootNamespace="ozmod_isdn"
+	RootNamespace="ftmod_isdn"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -45,7 +45,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -120,7 +120,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -195,7 +195,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -271,7 +271,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -377,7 +377,7 @@
 				>
 			</File>
 			<File
-				RelativePath="ozmod_isdn.c"
+				RelativePath="ftmod_isdn.c"
 				>
 			</File>
 			<File
@ -455,7 +455,7 @@
 				>
 			</File>
 			<File
-				RelativePath="zap_isdn.h"
+				RelativePath="ftdm_isdn.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_isdn/ozmod_isdn.2005.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_isdn/ozmod_isdn.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ozmod_isdn"
+	Name="ftmod_isdn"
 	ProjectGUID="{729344A5-D5E9-434D-8EE8-AF8C6C795D15}"
-	RootNamespace="ozmod_isdn"
+	RootNamespace="ftmod_isdn"
 	Keyword="Win32Proj"
 	>
 	<Platforms>
@ -41,7 +41,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -119,7 +119,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_ISDN_EXPORTS;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -228,7 +228,7 @@
 				>
 			</File>
 			<File
-				RelativePath="ozmod_isdn.c"
+				RelativePath="ftmod_isdn.c"
 				>
 			</File>
 			<File
@ -306,7 +306,7 @@
 				>
 			</File>
 			<File
-				RelativePath="zap_isdn.h"
+				RelativePath="ftdm_isdn.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_pika/ftmod_pika.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_pika"
+	Name="ftmod_pika"
 	ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"
-	RootNamespace="ozmod_pika"
+	RootNamespace="ftmod_pika"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -118,7 +118,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -177,7 +177,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\ozmod_pika.c"
+				RelativePath=".\ftmod_pika.c"
 				>
 			</File>
 		</Filter>
@ -187,7 +187,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\zap_pika.h"
+				RelativePath=".\ftdm_pika.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_pika/ozmod_pika.2005.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_pika/ozmod_pika.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ozmod_pika"
+	Name="ftmod_pika"
 	ProjectGUID="{E886B4D5-AB4F-4092-B8F4-3B06E1E462EF}"
-	RootNamespace="ozmod_pika"
+	RootNamespace="ftmod_pika"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -118,7 +118,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\isdn\include;..\..\include;..\..\..\pika\aoh\inc"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_PIKA_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_PIKA_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -177,7 +177,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\ozmod_pika.c"
+				RelativePath=".\ftmod_pika.c"
 				>
 			</File>
 		</Filter>
@ -187,7 +187,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath=".\zap_pika.h"
+				RelativePath=".\ftdm_pika.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_sangoma_boost"
+	Name="ftmod_sangoma_boost"
 	ProjectGUID="{D021EF2A-460D-4827-A0F7-41FDECF46F1B}"
-	RootNamespace="ozmod_sangoma_boost"
+	RootNamespace="ftmod_sangoma_boost"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
 	>
@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\..\include;..\..\isdn\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OZMOD_SANGOMA_BOOST_EXPORTS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@ -63,7 +63,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib"
+				AdditionalDependencies="freetdm.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;"
 				GenerateDebugInformation="true"
@ -120,7 +120,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OZMOD_SANGOMA_BOOST_EXPORTS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;FTMOD_SANGOMA_BOOST_EXPORTS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@ -179,7 +179,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="ozmod_sangoma_boost.c"
+				RelativePath="ftmod_sangoma_boost.c"
 				>
 			</File>
 			<File
@ -205,7 +205,7 @@
 				>
 			</File>
 			<File
-				RelativePath="zap_sangoma_boost.h"
+				RelativePath="ftdm_sangoma_boost.h"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.2008.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="ozmod_wanpipe"
+	Name="ftmod_wanpipe"
 	ProjectGUID="{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"
-	RootNamespace="ozmod_wanpipe"
+	RootNamespace="ftmod_wanpipe"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;&quot;C:\Program Files\Sangoma\lib&quot;"
 				GenerateDebugInformation="true"
@ -143,7 +143,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x64"
 				GenerateDebugInformation="true"
@ -218,7 +218,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
 				GenerateDebugInformation="true"
@ -296,7 +296,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x64"
 				GenerateDebugInformation="true"
@ -339,7 +339,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\ozmod_wanpipe.c"
+				RelativePath=".\ftmod_wanpipe.c"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ozmod_wanpipe.2005.vcproj
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ozmod_wanpipe.2005.vcproj
@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="ozmod_wanpipe"
+	Name="ftmod_wanpipe"
 	ProjectGUID="{1A145EE9-BBD8-45E5-98CD-EB4BE99E1DCD}"
-	RootNamespace="ozmod_wanpipe"
+	RootNamespace="ftmod_wanpipe"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
 				GenerateDebugInformation="true"
@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="openzap.lib libsangoma.lib"
+				AdditionalDependencies="freetdm.lib libsangoma.lib"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="&quot;$(OutDir)&quot;;../../../wanpipe/api/lib/x86"
 				GenerateDebugInformation="true"
@ -180,7 +180,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\ozmod_wanpipe.c"
+				RelativePath=".\ftmod_wanpipe.c"
 				>
 			</File>
 		</Filter>
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h
@ -36,8 +36,8 @@
 *
 */

-#ifndef OPENFTDM_H
-#define OPENFTDM_H
+#ifndef FREETDM_H
+#define FREETDM_H


 #if !defined(_XOPEN_SOURCE) && !defined(__FreeBSD__)
@ -62,7 +62,7 @@
 #define FT_DECLARE(type)			type __stdcall
 #define FT_DECLARE_NONSTD(type)		type __cdecl
 #define FT_DECLARE_DATA
-#elif defined(OPENFTDM_EXPORTS)
+#elif defined(FREETDM_EXPORTS)
 #define FT_DECLARE(type)			__declspec(dllexport) type __stdcall
 #define FT_DECLARE_NONSTD(type)		__declspec(dllexport) type __cdecl
 #define FT_DECLARE_DATA				__declspec(dllexport)