diff --git a/MAP/asn_src/Makefile b/MAP/asn_src/Makefile
index f21d4e3..c473ca7 100644
--- a/MAP/asn_src/Makefile
+++ b/MAP/asn_src/Makefile
@@ -1,5 +1,5 @@
 
 all:
-	cd gsm && $(MAKE)
-	cd ansi && $(MAKE)
+	cd GSM && $(MAKE)
+	#cd ansi && $(MAKE)
 
diff --git a/MAP/src/Makefile b/MAP/src/Makefile
index 6484630..3663899 100644
--- a/MAP/src/Makefile
+++ b/MAP/src/Makefile
@@ -31,6 +31,6 @@ ansi:
 .PHONY:	clean
 clean:
 	- rm -f $(BEAMS)
-	cd gsm && $(MAKE) $@
-	cd ansi && $(MAKE) $@
+	cd GSM && $(MAKE) $@
+	cd ANSI && $(MAKE) $@
 
diff --git a/TCAP/asn_src/Makefile b/TCAP/asn_src/Makefile
index 4b63fe3..48b8c0c 100644
--- a/TCAP/asn_src/Makefile
+++ b/TCAP/asn_src/Makefile
@@ -1,11 +1,11 @@
 
 .PHONY:	all
 all:
-	cd itu && $(MAKE)
-	cd ansi && $(MAKE)
+	cd ITU && $(MAKE)
+	cd ANSI && $(MAKE)
 
 .PHONY:	clean
 clean:
-	cd itu && $(MAKE) $@
-	cd ansi && $(MAKE) $@
+	cd ITU && $(MAKE) $@
+	cd ANSI && $(MAKE) $@
 
diff --git a/TCAP/doc/html/Makefile b/TCAP/doc/html/Makefile
index ebbb992..021b2f9 100644
--- a/TCAP/doc/html/Makefile
+++ b/TCAP/doc/html/Makefile
@@ -7,7 +7,7 @@ SRC		= ../../src
 %.html:${SRC}/%.erl
 	${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop
 
-%.html:${SRC}/itu/%.erl
+%.html:${SRC}/ITU/%.erl
 	${ERL} -noshell -run edoc_run file '"$<"' '[{dir,"."}]' -s init stop
 
 DOCS		= tcap.html tcap_tco_server.html
diff --git a/TCAP/src/ITU/tcap_dha_fsm.erl b/TCAP/src/ITU/tcap_dha_fsm.erl
index caa970a..0245386 100644
--- a/TCAP/src/ITU/tcap_dha_fsm.erl
+++ b/TCAP/src/ITU/tcap_dha_fsm.erl
@@ -67,8 +67,8 @@
 -include("sccp.hrl").
 %% record definitions for TCAP messages
 %-include("TCAPMessages.hrl").
-%-include("UnidialoguePDUs.hrl").
-%-include("DialoguePDUs.hrl").
+-include("UnidialoguePDUs.hrl").
+-include("DialoguePDUs.hrl").
 
 %% the dialogue_fsm state data
 -record(state, {usap, tco, supid, cco, otid, did, parms, appContextMode}).
diff --git a/TCAP/src/ITU/tcap_ism_fsm.erl b/TCAP/src/ITU/tcap_ism_fsm.erl
index 125a953..264fc66 100644
--- a/TCAP/src/ITU/tcap_ism_fsm.erl
+++ b/TCAP/src/ITU/tcap_ism_fsm.erl
@@ -53,7 +53,8 @@
 -behaviour(gen_fsm).
 
 %% call backs needed for gen_fsm behaviour
--export([init/1, handle_event/3, handle_info/3, terminate/3, code_change/4]).
+%-export([init/1, handle_event/3, handle_info/3, terminate/3, code_change/4]).
+-export([handle_info/3, terminate/3, code_change/4]).
 
 %% invocation_fsm state callbacks 
 -export([]).
@@ -76,8 +77,8 @@
 
 %% handle any other message
 handle_info(Info, StateName, State) ->
-	error_logger:format("~w (~w) received unexpected message: ~w~n", [?Module, self(), Event]),
-	{next_state, StateName, State};
+	error_logger:format("~w (~w) received unexpected message: ~w~n", [?MODULE, self(), Info]),
+	{next_state, StateName, State}.
 
 %% handle a shutdown request
 terminate(_Reason, _StateName, State) -> ok.
diff --git a/TCAP/src/ITU/tcap_tco_server.erl b/TCAP/src/ITU/tcap_tco_server.erl
index 6f3bd56..192a0a6 100644
--- a/TCAP/src/ITU/tcap_tco_server.erl
+++ b/TCAP/src/ITU/tcap_tco_server.erl
@@ -159,7 +159,7 @@
 
 % export the gen_server call backs
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-		terminate/2, code_change/3]).
+		terminate/2]).
 
 % behaviour modules must export this function
 -export([behaviour_info/1]).
diff --git a/TCAP/src/Makefile b/TCAP/src/Makefile
index 69c9ece..9f9b3ef 100644
--- a/TCAP/src/Makefile
+++ b/TCAP/src/Makefile
@@ -26,15 +26,15 @@ all:	$(BEAMS) itu ansi
 
 .PHONY:	itu
 itu:
-	cd itu && $(MAKE)
+	cd ITU && $(MAKE)
 
 .PHONY:	ansi
 ansi:
-	cd ansi && $(MAKE)
+	cd ANSI && $(MAKE)
 
 .PHONY:	clean
 clean:
 	- rm -f $(BEAMS)
-	cd itu && $(MAKE) $@
-	cd ansi && $(MAKE) $@
+	cd ITU && $(MAKE) $@
+	cd ANSI && $(MAKE) $@