diff --git a/configfile.c b/configfile.c
index 22f2e12..0989c79 100644
--- a/configfile.c
+++ b/configfile.c
@@ -200,7 +200,7 @@ BOOL ConfigFileSet(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR compoundKey, C
 		}
 		else if( SizeOfArray(lines) == 1 )
 		{
-			LINEPTR line = (LINEPTR)ArrayBackValue(LINEPTR, lines);
+			LINEPTR line = (LINEPTR)ArrayBack(LINEPTR, lines);
 			if( line )
 			{
   				VARIABLEPTR var = VariableCreate(StringArrayValues(parts)[1], stringValue);
diff --git a/configfile.h b/configfile.h
index b49aea2..909c559 100644
--- a/configfile.h
+++ b/configfile.h
@@ -2,7 +2,7 @@
 #define __CONFIGFILE_H
 #include <exec/types.h>
 #include <dos/dos.h>
-#include <proto/containerkit.h>
+#include <proto/containers.h>
 typedef APTR CONFIGFILEPTR;
 
 // added the BPTR version so we can use WorkspaceOpenFile.  
diff --git a/configmodel.c b/configmodel.c
index be95379..e690a60 100644
--- a/configmodel.c
+++ b/configmodel.c
@@ -609,7 +609,7 @@ StringArray CompoundKeySplitKeyCompletely(CONST_STRPTR key)
 	{
 		StringArrayAppendAndRetain(result, "");
 		StringArrayAppendAndRetain(result, "");
-		StringArrayAppendAndRetain(result, (STRPTR)ArrayBackValue(STRPTR, parts));
+		StringArrayAppendAndRetain(result, (STRPTR)ArrayBack(STRPTR, parts));
 	}
 	else if( numberOfParts == 2 ) // section and variable ["section","","var"]
 	{
@@ -630,7 +630,7 @@ StringArray CompoundKeySplitKeyCompletely(CONST_STRPTR key)
 		// start at index 1, and add (size -2 (start+end)) parts
 		StringArrayAppend(result, StringArrayJoinedParts(parts, '.', 1, SizeOfArray(parts)-2));
 
-		StringArrayAppendAndRetain(result, (STRPTR)ArrayBackValue(STRPTR, parts)); // variable
+		StringArrayAppendAndRetain(result, (STRPTR)ArrayBack(STRPTR, parts)); // variable
 	}
  	StringArrayFree(parts, TRUE);
 	return result;
@@ -664,7 +664,7 @@ StringArray CompoundKeySplitKeyForVar(CONST_STRPTR key)
 	// now we join all but the last part
  	sectionPart = StringArrayJoinedParts(parts, '.', 0, SizeOfArray(parts)-1);
  	StringArrayAppend(result, sectionPart); // its been alloced so dont copy
- 	varPart = (STRPTR)ArrayBackValue(STRPTR, parts);
+ 	varPart = (STRPTR)ArrayBack(STRPTR, parts);
  	StringArrayAppendAndRetain(result, varPart); // its a reference so copy
  	StringArrayFree(parts, TRUE);
 	return result;
diff --git a/containerkit.library b/containerkit.library
deleted file mode 100644
index 1bcac3f..0000000
Binary files a/containerkit.library and /dev/null differ
diff --git a/containers.library b/containers.library
new file mode 100644
index 0000000..d3637d0
Binary files /dev/null and b/containers.library differ
diff --git a/containers/linearray.c b/containers/linearray.c
index 082bed6..52a9283 100644
--- a/containers/linearray.c
+++ b/containers/linearray.c
@@ -1,6 +1,6 @@
 #include <exec/types.h>
 #include <proto/exec.h>
-#include <proto/containerkit.h>
+#include <proto/containers.h>
 #include "linearray.h"
 #include "configmodel.h"
 
@@ -13,8 +13,8 @@
 
 LineArray LineArrayNew(VOID)
 {
-	#define SIZE_APTR 2
-	return NewArray(SIZE_APTR);
+	#define SIZE_APTR 4
+	return NewArray(SIZE_APTR, TAG_DONE);
 }
 
 VOID LineArrayAppend(LineArray array, LINEPTR value)
@@ -44,7 +44,7 @@ VOID LineArrayFree(LineArray array, BOOL freeLines)
 
 LINEPTR* LineArrayValues(LineArray array)
 {
-	return ArrayValues(LINEPTR, array);
+	return ArrayElements(LINEPTR, array);
 }
 
 
diff --git a/containers/linearray.h b/containers/linearray.h
index 23ea8ad..1b2911e 100644
--- a/containers/linearray.h
+++ b/containers/linearray.h
@@ -3,8 +3,8 @@
 
 #include <exec/types.h>
 #include "types.h"
-#include <proto/containerkit.h>
-#include <containerkit/array.h>
+#include <proto/containers.h>
+#include <containers/array.h>
 
 LineArray LineArrayNew(VOID); 
 VOID LineArrayAppend(LineArray array, LINEPTR value);
diff --git a/containers/sectionarray.c b/containers/sectionarray.c
index 5e7fbd9..ea7b76e 100644
--- a/containers/sectionarray.c
+++ b/containers/sectionarray.c
@@ -4,10 +4,10 @@
 #include "configmodel.h"
 
 
-#define SIZE_APTR 2
+#define SIZE_APTR 4
 SectionArray SectionArrayNew(VOID) 
 {
-	return NewArray(SIZE_APTR);
+	return NewArray(SIZE_APTR, TAG_DONE);
 }
 
 VOID SectionArrayAppend(SectionArray array, SECTIONPTR value)
@@ -29,13 +29,13 @@ VOID SectionArrayFree(SectionArray array, BOOL freeSections)
 
 SECTIONPTR* SectionArrayValues(SectionArray array)
 {
-	return ArrayValues(SECTIONPTR, array);
+	return ArrayElements(SECTIONPTR, array);
 }
 
 
 VariableArray VariableArrayNew(VOID)
 {
-	return NewArray(SIZE_APTR);
+	return NewArray(SIZE_APTR, TAG_DONE);
 }
 
 VOID VariableArrayAppend(VariableArray array, VARIABLEPTR value)
@@ -57,6 +57,6 @@ VOID VariableArrayFree(VariableArray array, BOOL freeVars)
 
 VARIABLEPTR* VariableArrayValues(VariableArray array)
 {
-	return ArrayValues(VARIABLEPTR, array);
+	return ArrayElements(VARIABLEPTR, array);
 }
 
diff --git a/containers/sectionarray.h b/containers/sectionarray.h
index eef808e..516d9c1 100644
--- a/containers/sectionarray.h
+++ b/containers/sectionarray.h
@@ -2,8 +2,8 @@
 #define __SECTIONARRAY_H
 
 #include "types.h"
-#include <proto/containerkit.h>
-#include <containerkit/array.h>
+#include <proto/containers.h>
+#include <containers/array.h>
 
 SectionArray SectionArrayNew(VOID); 
 VOID SectionArrayAppend(SectionArray array, SECTIONPTR value);
diff --git a/containers/sectionmap.c b/containers/sectionmap.c
index edfb790..eb15e1d 100644
--- a/containers/sectionmap.c
+++ b/containers/sectionmap.c
@@ -3,9 +3,9 @@
 
 SectionMap SectionMapNew()
 {
-	SectionMap result = NewMap(CNTKIT_KEY_STRING,
-		CNTKIT_CAPACITY, 8,
-		CNTKIT_VALUESIZE, 4,
+	SectionMap result = NewMap(CNT_KEY_STRING,
+		CNT_CAPACITY, 8,
+		CNT_VALUESIZE, 4,
 		TAG_DONE);
 		
 	return result;
diff --git a/containers/sectionmap.h b/containers/sectionmap.h
index e058a96..a01b15b 100644
--- a/containers/sectionmap.h
+++ b/containers/sectionmap.h
@@ -2,7 +2,7 @@
 #define __SECTIONMAP_H
 
 #include <exec/types.h>
-#include <proto/containerkit.h>
+#include <proto/containers.h>
 #include "configmodel.h"
 
 SectionMap SectionMapNew(VOID);
diff --git a/containers/stringarray.c b/containers/stringarray.c
index 1e7dcfb..058463d 100644
--- a/containers/stringarray.c
+++ b/containers/stringarray.c
@@ -1,6 +1,6 @@
 #include "stringarray.h"
 
-#include <proto/containerkit.h>
+#include <proto/containers.h>
 #include <proto/exec.h>
 #include <string.h>
 
@@ -8,8 +8,8 @@
 #define MIN(x,y)  (x<y?x:y)
 StringArray StringArrayNew(VOID) 
 {
-	#define SIZE_STRPTR 2
-	return NewArray(SIZE_STRPTR);
+	#define SIZE_STRPTR 4
+	return NewArray(SIZE_STRPTR, TAG_DONE);
 }
 
 VOID StringArrayAppend(StringArray array, CONST_STRPTR value)
@@ -79,5 +79,5 @@ STRPTR StringArrayJoinedParts(StringArray array, BYTE linkCharacter, ULONG start
 
 CONST_STRPTR* StringArrayValues(StringArray array)
 {
-	return ArrayValues(CONST_STRPTR, array);
+	return ArrayElements(CONST_STRPTR, array);
 }
\ No newline at end of file
diff --git a/containers/stringarray.h b/containers/stringarray.h
index 9a637c9..96efe1f 100644
--- a/containers/stringarray.h
+++ b/containers/stringarray.h
@@ -2,8 +2,8 @@
 #define __STRINGARRAY_H
 
 #include "types.h"
-#include <proto/containerkit.h>
-#include <containerkit/array.h>
+#include <proto/containers.h>
+#include <containers/array.h>
 
 StringArray StringArrayNew(VOID); 
 VOID StringArrayAppend(StringArray array, CONST_STRPTR value);
diff --git a/main.c b/main.c
index 40a3636..3da53b4 100644
--- a/main.c
+++ b/main.c
@@ -7,7 +7,7 @@
 #include "containers/linearray.h"
 #include "configfile.h"
 #include "configmodel.h"
-#include <proto/containerkit.h>
+#include <proto/containers.h>
 
 WORD DoTheWork(STRPTR filename);
 VOID ProcessFile(BPTR configFile);
@@ -15,12 +15,12 @@ VOID ProcessFile(BPTR configFile);
 char *vers="\0$VER: ConfigReader (dd.mm.yyyy)";
 char *stacksize = "$STACK:8192"; // only works when started from CLI
 
-struct Library *ContainerkitBase;
+struct Library *ContainersBase;
 
 WORD DoTheWork(STRPTR filename)
 {
 	WORD result = RETURN_OK;
-	if (ContainerkitBase)
+	if (ContainersBase)
 	{
 		CONFIGFILEPTR config = ConfigFileReadName(filename);
 		if( config != NULL )
@@ -84,13 +84,13 @@ WORD main(WORD argc, STRPTR *argv)
 	// end markers are "clean" and I can ensure I'm not leaking.
 	Printf("\n"); 
 	
-	ContainerkitBase = OpenLibrary("containerkit.library", 1);
-	if( ContainerkitBase )
+	ContainersBase = OpenLibrary("containers.library", 1);
+	if( ContainersBase )
 	{
 		Printf("\n\nrunning   (%ld bytes avail)\n\n", AvailMem(0));	
 		result = DoTheWork(argv[1]);
 		Printf("\n\ndone      (%ld bytes avail)\n\n", AvailMem(0));
-		CloseLibrary(ContainerkitBase);
+		CloseLibrary(ContainersBase);
 	} 
 	else 
 	{
diff --git a/sectionstore.c b/sectionstore.c
index 545ccaf..94f4678 100644
--- a/sectionstore.c
+++ b/sectionstore.c
@@ -94,7 +94,7 @@ SECTIONPTR SectionStoreCurrentSection(SECTIONSTOREPTR abstractSectionStore)
 	SECTIONPTR result = NULL;
 	if( store != NULL && SizeOfArray(store->array) > 0 )
 	{
-		result = ArrayBackValue(SECTIONPTR, store->array);
+		result = ArrayBack(SECTIONPTR, store->array);
 	}
 	return result;
 }
@@ -139,7 +139,7 @@ VARIABLEPTR SectionStoreGet(SECTIONSTOREPTR sectionStore, CONST_STRPTR canonical
 {
 	VARIABLEPTR result = NULL;
 	LineArray lines = SectionStoreFindLines(sectionStore, canonicalSectionName, varKey);
-	result = LineGetVariable((LINEPTR)ArrayBackValue(LINEPTR, lines));
+	result = LineGetVariable((LINEPTR)ArrayBack(LINEPTR, lines));
 	LineArrayFree(lines, FALSE);
 	return result;
 }