diff --git a/exec/Makefile b/exec/Makefile
index dc328505..0ef6807c 100644
--- a/exec/Makefile
+++ b/exec/Makefile
@@ -115,49 +115,49 @@ totemconfig.o: totemconfig.c
 
 # DO NOT DELETE
 
-main.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+main.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 main.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 main.o: ../include/queue.h totempg.h aispoll.h totemsrp.h mempool.h mainparse.h
 main.o: main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h evt.h hdb.h
 main.o: ../include/saEvt.h swab.h print.h
-clm.o: ../include/ais_types.h ../include/saClm.h ../include/ais_types.h
+clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
 clm.o: ../include/ipc_evs.h evs.h ../include/saClm.h ../include/ipc_gen.h
 clm.o: ../include/ipc_clm.h ../include/list.h ../include/queue.h aispoll.h
 clm.o: totempg.h totemsrp.h mainparse.h main.h clm.h amf.h handlers.h ckpt.h
 clm.o: evt.h hdb.h ../include/saEvt.h mempool.h print.h
-amf.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+amf.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 amf.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 amf.o: ../include/queue.h totempg.h aispoll.h totemsrp.h mempool.h util.h
 amf.o: mainparse.h main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h evt.h
 amf.o: hdb.h ../include/saEvt.h print.h
-ckpt.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+ckpt.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 ckpt.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 ckpt.o: ../include/queue.h aispoll.h mempool.h util.h mainparse.h totempg.h
 ckpt.o: totemsrp.h main.h clm.h ../include/saClm.h amf.h handlers.h ckpt.h
 ckpt.o: evt.h hdb.h ../include/saEvt.h print.h
-evt.o: ../include/ipc_evt.h ../include/ais_types.h ../include/saEvt.h
+evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
 evt.o: ../include/saClm.h ../include/ipc_gen.h ../include/list.h
-evt.o: ../include/queue.h util.h ../include/ais_types.h aispoll.h mempool.h
+evt.o: ../include/queue.h util.h ../include/saAis.h aispoll.h mempool.h
 evt.o: mainparse.h totempg.h totemsrp.h main.h evs.h clm.h ../include/saClm.h
 evt.o: amf.h ../include/ipc_evs.h handlers.h ckpt.h evt.h hdb.h
 evt.o: ../include/saEvt.h swab.h print.h
-evs.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+evs.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 evs.o: evs.h ../include/saClm.h ../include/ipc_gen.h ../include/list.h
 evs.o: ../include/queue.h aispoll.h totempg.h totemsrp.h mainparse.h main.h clm.h
 evs.o: ../include/saClm.h amf.h handlers.h ckpt.h evt.h hdb.h
 evs.o: ../include/saEvt.h mempool.h print.h
-mainparse.o: ../include/ais_types.h ../include/list.h util.h mainparse.h aispoll.h
+mainparse.o: ../include/saAis.h ../include/list.h util.h mainparse.h aispoll.h
 mainparse.o: totempg.h totemsrp.h mempool.h print.h ../include/saClm.h
-mainparse.o: ../include/ais_types.h
-print.o: print.h ../include/ais_types.h ../include/saClm.h
-print.o: ../include/ais_types.h mainparse.h ../include/list.h aispoll.h totempg.h
+mainparse.o: ../include/saAis.h
+print.o: print.h ../include/saAis.h ../include/saClm.h
+print.o: ../include/saAis.h mainparse.h ../include/list.h aispoll.h totempg.h
 print.o: totemsrp.h
 mempool.o: ../include/list.h mempool.h
-util.o: ../include/ais_types.h ../include/list.h util.h
-aispoll.o: aispoll.h ../include/list.h hdb.h ../include/ais_types.h tlist.h
+util.o: ../include/saAis.h ../include/list.h util.h
+aispoll.o: aispoll.h ../include/list.h hdb.h ../include/saAis.h tlist.h
 totemsrp.o: aispoll.h totemsrp.h ../include/queue.h ../include/sq.h
-totemsrp.o: ../include/list.h hdb.h ../include/ais_types.h swab.h crypto.h
+totemsrp.o: ../include/list.h hdb.h ../include/saAis.h swab.h crypto.h
 totempg.o: totempg.h aispoll.h totemsrp.h swab.h
 tlist.o: ../include/list.h tlist.h
-hdb.o: hdb.h ../include/ais_types.h
+hdb.o: hdb.h ../include/saAis.h
 crypto.o: crypto.h
diff --git a/exec/aispoll.c b/exec/aispoll.c
index 3a8b7755..20e2858a 100644
--- a/exec/aispoll.c
+++ b/exec/aispoll.c
@@ -41,7 +41,7 @@
 #include "aispoll.h"
 #include "../include/list.h"
 #include "hdb.h"
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "tlist.h"
 
 typedef int (*dispatch_fn_t) (poll_handle poll_handle, int fd, int revents, void *data, unsigned int *prio);
diff --git a/exec/amf.c b/exec/amf.c
index 82172059..813d7e72 100644
--- a/exec/amf.c
+++ b/exec/amf.c
@@ -45,7 +45,7 @@
 #include <signal.h>
 #include <string.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_amf.h"
 #include "../include/list.h"
diff --git a/exec/ckpt.c b/exec/ckpt.c
index f9e6df2e..90b0fdda 100644
--- a/exec/ckpt.c
+++ b/exec/ckpt.c
@@ -45,7 +45,7 @@
 #include <signal.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saCkpt.h"
 #include "../include/ipc_ckpt.h"
 #include "../include/list.h"
diff --git a/exec/ckpt.h b/exec/ckpt.h
index e3815931..c46ce40a 100644
--- a/exec/ckpt.h
+++ b/exec/ckpt.h
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saCkpt.h"
 #include "aispoll.h"
 #include "totemsrp.h"
diff --git a/exec/clm.c b/exec/clm.c
index beb8be11..128ee9b3 100644
--- a/exec/clm.c
+++ b/exec/clm.c
@@ -51,7 +51,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_clm.h"
diff --git a/exec/clm.h b/exec/clm.h
index eea5addd..0f6b0a21 100644
--- a/exec/clm.h
+++ b/exec/clm.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 
 #ifndef CLM_H_DEFINED
diff --git a/exec/evs.c b/exec/evs.c
index 4a8447df..4c613a4e 100644
--- a/exec/evs.c
+++ b/exec/evs.c
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_evs.h"
 #include "../include/list.h"
diff --git a/exec/evs.h b/exec/evs.h
index f2da8f72..c92af308 100644
--- a/exec/evs.h
+++ b/exec/evs.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 #ifndef EVS_H_DEFINED
 #define EVS_H_DEFINED
diff --git a/exec/hdb.h b/exec/hdb.h
index 19f19716..110853e8 100644
--- a/exec/hdb.h
+++ b/exec/hdb.h
@@ -35,7 +35,7 @@
 #ifndef HDB_H_DEFINED
 #define HDB_H_DEFINED
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 struct saHandleDatabase {
 	unsigned int handleCount;
diff --git a/exec/main.c b/exec/main.c
index e59c72b7..9edab900 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -56,7 +56,7 @@
 #include <sched.h>
 #include <time.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/queue.h"
 #include "poll.h"
diff --git a/exec/main.h b/exec/main.h
index 381476f5..d04c988c 100644
--- a/exec/main.h
+++ b/exec/main.h
@@ -35,7 +35,7 @@
 #define TRUE 1
 #define FALSE 0
 #include <sys/un.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/queue.h"
 #include "poll.h"
 #include "evs.h"
diff --git a/exec/mainparse.c b/exec/mainparse.c
index f5faecf3..8fa40a58 100644
--- a/exec/mainparse.c
+++ b/exec/mainparse.c
@@ -40,7 +40,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "util.h"
 #include "mainparse.h"
diff --git a/exec/mainparse.h b/exec/mainparse.h
index e63d40b0..e8ece488 100644
--- a/exec/mainparse.h
+++ b/exec/mainparse.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"
diff --git a/exec/print.c b/exec/print.c
index c7330e8e..171db568 100644
--- a/exec/print.c
+++ b/exec/print.c
@@ -43,7 +43,7 @@
 
 
 #include "print.h"
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 unsigned int logmode = LOG_MODE_STDERR | LOG_MODE_SYSLOG;
 char *logfile = 0;
diff --git a/exec/print.h b/exec/print.h
index 427bc210..799b7246 100644
--- a/exec/print.h
+++ b/exec/print.h
@@ -34,7 +34,7 @@
 #ifndef PRINT_H_DEFINED
 #define PRINT_H_DEFINED
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 
 #define LOG_MODE_DEBUG		1
diff --git a/exec/sync.c b/exec/sync.c
index 4e0ed544..8258d041 100644
--- a/exec/sync.c
+++ b/exec/sync.c
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "main.h"
 #include "sync.h"
 #include "totempg.h"
diff --git a/exec/totemconfig.h b/exec/totemconfig.h
index abc0dd8b..3d8db1ca 100644
--- a/exec/totemconfig.h
+++ b/exec/totemconfig.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"
diff --git a/exec/totemparse.h b/exec/totemparse.h
index 1ff3e3aa..c8df825c 100644
--- a/exec/totemparse.h
+++ b/exec/totemparse.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <netinet/in.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "aispoll.h"
 #include "totemsrp.h"
diff --git a/exec/util.c b/exec/util.c
index 0f1f8870..350e440c 100644
--- a/exec/util.c
+++ b/exec/util.c
@@ -38,7 +38,7 @@
 #include <errno.h>
 #include <sys/time.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "util.h"
 
diff --git a/exec/util.h b/exec/util.h
index 08556e68..c8d620f9 100644
--- a/exec/util.h
+++ b/exec/util.h
@@ -35,7 +35,7 @@
 #ifndef UTIL_H_DEFINED
 #define UTIL_H_DEFINED
 #include <sys/time.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 
 /*
  * Compare two names.  returns non-zero on match.
diff --git a/include/ais_amf.h b/include/ais_amf.h
index 196bf2a2..70025762 100644
--- a/include/ais_amf.h
+++ b/include/ais_amf.h
@@ -35,7 +35,7 @@
 #ifndef AIS_AMF_H_DEFINED
 #define AIS_AMF_H_DEFINED
 
-#include "ais_types.h"
+#include "saAis.h"
 
 typedef void (*SaAmfHealthcheckCallbackT) (
 	SaInvocationT invocation,
diff --git a/include/ipc_amf.h b/include/ipc_amf.h
index e15a0417..2e56acf8 100644
--- a/include/ipc_amf.h
+++ b/include/ipc_amf.h
@@ -36,7 +36,7 @@
 
 #include <netinet/in.h>
 #include "ipc_gen.h"
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 enum req_amf_response_interfaces {
diff --git a/include/ipc_ckpt.h b/include/ipc_ckpt.h
index 153e1400..ffb4239e 100644
--- a/include/ipc_ckpt.h
+++ b/include/ipc_ckpt.h
@@ -34,7 +34,7 @@
 #ifndef IPC_CKPT_H_DEFINED
 #define IPC_CKPT_H_DEFINED
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "ipc_gen.h"
 
diff --git a/include/ipc_clm.h b/include/ipc_clm.h
index 76cbf141..6eb122f7 100644
--- a/include/ipc_clm.h
+++ b/include/ipc_clm.h
@@ -35,7 +35,7 @@
 #define IPC_CLM_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saClm.h"
 #include "ipc_gen.h"
 
diff --git a/include/ipc_evs.h b/include/ipc_evs.h
index c6033459..2cc56128 100644
--- a/include/ipc_evs.h
+++ b/include/ipc_evs.h
@@ -35,7 +35,7 @@
 #define IPC_EVS_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "evs.h"
 #include "ipc_gen.h"
 
diff --git a/include/ipc_evt.h b/include/ipc_evt.h
index 81ce6bb5..6e121b9b 100644
--- a/include/ipc_evt.h
+++ b/include/ipc_evt.h
@@ -35,7 +35,7 @@
 #define IPC_EVT_H_DEFINED
 
 #include <netinet/in.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 #include "saClm.h"
 #include "ipc_gen.h"
diff --git a/include/ais_types.h b/include/saAis.h
similarity index 99%
rename from include/ais_types.h
rename to include/saAis.h
index 1bbb4f23..0768ef5c 100644
--- a/include/ais_types.h
+++ b/include/saAis.h
@@ -74,8 +74,8 @@ typedef struct {
 
 typedef struct {
 	char releaseCode;
-	unsigned char major;
-	unsigned char minor;
+	unsigned char majorVersion;
+	unsigned char minorVersion;
 } SaVersionT;
 
 #define SA_TRACK_CURRENT 0x01
diff --git a/include/saClm.h b/include/saClm.h
index 7be60bb1..c4c6203b 100644
--- a/include/saClm.h
+++ b/include/saClm.h
@@ -32,7 +32,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ais_types.h"
+#include "saAis.h"
 
 #ifndef AIS_CLM_H_DEFINED
 #define AIS_CLM_H_DEFINED
diff --git a/include/saEvt.h b/include/saEvt.h
index eaeeece9..75b24779 100644
--- a/include/saEvt.h
+++ b/include/saEvt.h
@@ -31,7 +31,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "ais_types.h"
+#include "saAis.h"
 
 #ifndef AIS_EVT_H_DEFINED
 #define AIS_EVT_H_DEFINED
@@ -57,8 +57,8 @@ typedef void
 );
 
 typedef struct{
-    const SaEvtChannelOpenCallbackT saEvtChannelOpenCallback;
-    const SaEvtEventDeliverCallbackT saEvtEventDeliverCallback; 
+    SaEvtChannelOpenCallbackT saEvtChannelOpenCallback;
+    SaEvtEventDeliverCallbackT saEvtEventDeliverCallback; 
 } SaEvtCallbacksT;
 
 #define SA_EVT_CHANNEL_PUBLISHER  0X1
diff --git a/lib/Makefile b/lib/Makefile
index 5ddf2214..10d05811 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -119,18 +119,18 @@ depend:
 	makedepend -Y -- $(CFLAGS) $(LIBAIS_SRC) > /dev/null 2>&1
 # DO NOT DELETE
 
-util.o: ../include/ais_types.h ../include/ipc_evs.h ../include/ais_types.h
+util.o: ../include/saAis.h ../include/ipc_evs.h ../include/saAis.h
 util.o: ../include/evs.h ../include/saClm.h ../include/ipc_gen.h util.h
-amf.o: ../include/ais_types.h ../include/ais_amf.h ../include/ais_types.h
+amf.o: ../include/saAis.h ../include/ais_amf.h ../include/saAis.h
 amf.o: ../include/ipc_evs.h ../include/evs.h ../include/saClm.h
 amf.o: ../include/ipc_gen.h util.h
-clm.o: ../include/ais_types.h ../include/saClm.h ../include/ais_types.h
+clm.o: ../include/saAis.h ../include/saClm.h ../include/saAis.h
 clm.o: ../include/ipc_evs.h ../include/evs.h ../include/saClm.h
 clm.o: ../include/ipc_gen.h ../include/ipc_clm.h util.h
-ckpt.o: ../include/list.h ../include/ais_types.h ../include/saCkpt.h
-ckpt.o: ../include/ais_types.h ../include/ipc_evs.h ../include/evs.h
+ckpt.o: ../include/list.h ../include/saAis.h ../include/saCkpt.h
+ckpt.o: ../include/saAis.h ../include/ipc_evs.h ../include/evs.h
 ckpt.o: ../include/saClm.h ../include/ipc_gen.h util.h
-evt.o: ../include/ipc_evt.h ../include/ais_types.h ../include/saEvt.h
+evt.o: ../include/ipc_evt.h ../include/saAis.h ../include/saEvt.h
 evt.o: ../include/saClm.h ../include/ipc_gen.h util.h ../include/ipc_evs.h
 evt.o: ../include/evs.h ../exec/totempg.h ../exec/aispoll.h
 evt.o: ../exec/totemsrp.h
diff --git a/lib/amf.c b/lib/amf.c
index 9a89c3f8..1e369d94 100644
--- a/lib/amf.c
+++ b/lib/amf.c
@@ -45,7 +45,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ais_amf.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_amf.h"
diff --git a/lib/ckpt.c b/lib/ckpt.c
index d84b9198..40dcb92a 100644
--- a/lib/ckpt.c
+++ b/lib/ckpt.c
@@ -45,7 +45,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/list.h"
 #include "../include/saCkpt.h"
 #include "../include/ipc_gen.h"
diff --git a/lib/clm.c b/lib/clm.c
index 84de6e31..ba6461d3 100644
--- a/lib/clm.c
+++ b/lib/clm.c
@@ -44,7 +44,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/saClm.h"
 #include "../include/ipc_gen.h"
 #include "../include/ipc_clm.h"
diff --git a/lib/evs.c b/lib/evs.c
index 16b4fe4f..2f54c33e 100644
--- a/lib/evs.c
+++ b/lib/evs.c
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/evs.h"
 #include "../include/ipc_evs.h"
 #include "util.h"
diff --git a/lib/util.c b/lib/util.c
index e8cb6085..56f0a219 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -50,7 +50,7 @@
 #include <netinet/in.h>
 #include <assert.h>
 
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../include/ipc_gen.h"
 #include "util.h"
 
@@ -610,7 +610,7 @@ saVersionVerify (
 			/*
 			 * Check if we can support the major version requested.
 			 */
-			if (versionDatabase->versionsSupported[i].major >= version->major) {
+			if (versionDatabase->versionsSupported[i].majorVersion >= version->majorVersion) {
 				error = SA_AIS_OK;
 				break;
 			} 
diff --git a/test/Makefile b/test/Makefile
index 0a8567f7..6d9a0b29 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -147,24 +147,24 @@ depend:
 	makedepend -Y -- $(CFLAGS) $(TEST_SRC) > /dev/null 2>&1
 # DO NOT DELETE
 
-testclm.o: ../include/ais_types.h ../include/saClm.h
-testamf.o: ../include/ais_types.h ../include/ais_amf.h ../include/saClm.h
-testamf1.o: ../include/ais_types.h ../include/ais_amf.h
-testamf2.o: ../include/ais_types.h ../include/ais_amf.h
-testamf3.o: ../include/ais_types.h ../include/ais_amf.h
-testamf4.o: ../include/ais_types.h ../include/ais_amf.h
-testamf5.o: ../include/ais_types.h ../include/ais_amf.h
-testamf6.o: ../include/ais_types.h ../include/ais_amf.h
-testamfth.o: ../include/ais_types.h ../include/ais_amf.h ../include/saClm.h
-testckpt.o: ../include/ais_types.h ../include/saCkpt.h sa_error.h
-ckptstress.o: ../include/ais_types.h ../include/saCkpt.h
-ckptbench.o: ../include/ais_types.h ../include/saCkpt.h
-ckptbenchth.o: ../include/ais_types.h ../include/saCkpt.h
-testevt.o: ../include/ais_types.h ../include/saEvt.h
+testclm.o: ../include/saAis.h ../include/saClm.h
+testamf.o: ../include/saAis.h ../include/ais_amf.h ../include/saClm.h
+testamf1.o: ../include/saAis.h ../include/ais_amf.h
+testamf2.o: ../include/saAis.h ../include/ais_amf.h
+testamf3.o: ../include/saAis.h ../include/ais_amf.h
+testamf4.o: ../include/saAis.h ../include/ais_amf.h
+testamf5.o: ../include/saAis.h ../include/ais_amf.h
+testamf6.o: ../include/saAis.h ../include/ais_amf.h
+testamfth.o: ../include/saAis.h ../include/ais_amf.h ../include/saClm.h
+testckpt.o: ../include/saAis.h ../include/saCkpt.h sa_error.h
+ckptstress.o: ../include/saAis.h ../include/saCkpt.h
+ckptbench.o: ../include/saAis.h ../include/saCkpt.h
+ckptbenchth.o: ../include/saAis.h ../include/saCkpt.h
+testevt.o: ../include/saAis.h ../include/saEvt.h
 testevs.o: ../include/evs.h
-evsbench.o: ../include/ais_types.h ../include/evs.h
-subscription.o: ../include/ais_types.h ../include/saEvt.h
-publish.o: ../include/ais_types.h ../include/saEvt.h
-evtbench.o: ../include/ais_types.h ../include/saEvt.h
-sa_error.o: ../include/ais_types.h
-unlink.o: ../include/ais_types.h ../include/saEvt.h
+evsbench.o: ../include/saAis.h ../include/evs.h
+subscription.o: ../include/saAis.h ../include/saEvt.h
+publish.o: ../include/saAis.h ../include/saEvt.h
+evtbench.o: ../include/saAis.h ../include/saEvt.h
+sa_error.o: ../include/saAis.h
+unlink.o: ../include/saAis.h ../include/saEvt.h
diff --git a/test/ckpt-rd.c b/test/ckpt-rd.c
index e3342105..3e0ba7a6 100644
--- a/test/ckpt-rd.c
+++ b/test/ckpt-rd.c
@@ -43,7 +43,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 
diff --git a/test/ckpt-wr.c b/test/ckpt-wr.c
index 9a772d0a..48f9d467 100644
--- a/test/ckpt-wr.c
+++ b/test/ckpt-wr.c
@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 
diff --git a/test/ckptbench.c b/test/ckptbench.c
index eaab3202..29d5434e 100644
--- a/test/ckptbench.c
+++ b/test/ckptbench.c
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 int alarm_notice;
diff --git a/test/ckptbenchth.c b/test/ckptbenchth.c
index 1b0ddfe8..430ed80b 100644
--- a/test/ckptbenchth.c
+++ b/test/ckptbenchth.c
@@ -46,7 +46,7 @@
 #include <pthread.h>
 #include <assert.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/ckptstress.c b/test/ckptstress.c
index 43439b15..5480cb97 100644
--- a/test/ckptstress.c
+++ b/test/ckptstress.c
@@ -42,7 +42,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 int ckptinv;
diff --git a/test/evsbench.c b/test/evsbench.c
index 4cafc639..243b85d8 100644
--- a/test/evsbench.c
+++ b/test/evsbench.c
@@ -49,7 +49,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "evs.h"
 
 volatile static int alarm_notice = 0;
diff --git a/test/evtbench.c b/test/evtbench.c
index f15b3531..5e2c5584 100644
--- a/test/evtbench.c
+++ b/test/evtbench.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 // #define EVENT_SUBSCRIBE
diff --git a/test/publish.c b/test/publish.c
index bc1bf788..84732a59 100644
--- a/test/publish.c
+++ b/test/publish.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 // #define EVENT_SUBSCRIBE
diff --git a/test/sa_error.c b/test/sa_error.c
index 72f22c82..52450e6e 100644
--- a/test/sa_error.c
+++ b/test/sa_error.c
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "ais_types.h"
+#include "saAis.h"
 
 const char *sa_error_list[] = {
 	"OUT_OF_RANGE",
diff --git a/test/subscription.c b/test/subscription.c
index 72cbc52a..13188bc2 100644
--- a/test/subscription.c
+++ b/test/subscription.c
@@ -11,7 +11,7 @@
 #include <sys/poll.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 #define  TEST_EVENT_ORDER 1
diff --git a/test/test.cpp b/test/test.cpp
index 192579cc..713ef927 100644
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 
 
diff --git a/test/testamf.c b/test/testamf.c
index 03ccbb91..67d4a64c 100644
--- a/test/testamf.c
+++ b/test/testamf.c
@@ -41,7 +41,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 #include "saClm.h"
 
diff --git a/test/testamf1.c b/test/testamf1.c
index 532f0b18..0e1b2423 100644
--- a/test/testamf1.c
+++ b/test/testamf1.c
@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <sched.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamf2.c b/test/testamf2.c
index e6489c69..704ed57e 100644
--- a/test/testamf2.c
+++ b/test/testamf2.c
@@ -42,7 +42,7 @@
 #include <sys/un.h>
 #include <sched.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamf3.c b/test/testamf3.c
index 02cff196..0e7c5cbe 100644
--- a/test/testamf3.c
+++ b/test/testamf3.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamf4.c b/test/testamf4.c
index 6753543e..9b9fd7d2 100644
--- a/test/testamf4.c
+++ b/test/testamf4.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamf5.c b/test/testamf5.c
index 0ea3549f..ad761f4a 100644
--- a/test/testamf5.c
+++ b/test/testamf5.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamf6.c b/test/testamf6.c
index f98dce2c..a7f713e7 100644
--- a/test/testamf6.c
+++ b/test/testamf6.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 
 void printSaNameT (SaNameT *name)
diff --git a/test/testamfth.c b/test/testamfth.c
index 963484d5..d77ccba1 100644
--- a/test/testamfth.c
+++ b/test/testamfth.c
@@ -41,7 +41,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "ais_amf.h"
 #include "saClm.h"
 
diff --git a/test/testckpt.c b/test/testckpt.c
index 01dfd7eb..3e883ac1 100644
--- a/test/testckpt.c
+++ b/test/testckpt.c
@@ -43,7 +43,7 @@
 #include <sys/un.h>
 #include <sys/time.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saCkpt.h"
 #include "sa_error.h"
 
diff --git a/test/testclm.c b/test/testclm.c
index 20e987a8..7ebf30c3 100644
--- a/test/testclm.c
+++ b/test/testclm.c
@@ -42,7 +42,7 @@
 #include <sys/select.h>
 #include <sys/un.h>
 
-#include "ais_types.h"
+#include "saAis.h"
 #include "saClm.h"
 
 void printSaClmNodeAddressT (SaClmNodeAddressT *nodeAddress) {
diff --git a/test/testevt.c b/test/testevt.c
index 568118f9..aeff7cfc 100644
--- a/test/testevt.c
+++ b/test/testevt.c
@@ -62,7 +62,7 @@
 #include <unistd.h>
 #include <sys/poll.h>
 #include <malloc.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 extern int get_sa_error(SaAisErrorT, char *, int);
diff --git a/test/testparse.c b/test/testparse.c
index a6bd86db..ec8aa5bf 100644
--- a/test/testparse.c
+++ b/test/testparse.c
@@ -33,7 +33,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include "../include/ais_types.h"
+#include "../include/saAis.h"
 #include "../exec/parse.h"
 #include "../exec/print.h"
 
diff --git a/test/unlink.c b/test/unlink.c
index fb6be996..a948ddd0 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 #include <getopt.h>
 #include <sys/time.h>
-#include "ais_types.h"
+#include "saAis.h"
 #include "saEvt.h"
 
 #define TRY_WAIT 2