diff --git a/main.go b/main.go
index b893c49..b89a70d 100644
--- a/main.go
+++ b/main.go
@@ -23,7 +23,7 @@ func main() {
 	header(f, "testautogen")
 	syncLock(f, "gitTagslock")
 	iterTop(f, "GitTag")
-	iterNext(f, "GitTag")
+	iterNext(f)
 	iterSort(f)
 	iterAppend(f)
 	iterEnd(f)
@@ -80,9 +80,9 @@ func iterTop(w io.Writer, name string) {
 	fmt.Fprintln(w, "")
 }
 
-func iterNext(w io.Writer, name string) {
+func iterNext(w io.Writer) {
 	fmt.Fprintln(w, "// Next() returns the next thing in the array")
-	fmt.Fprintln(w, "func (it *" + name + "Iterator) Next() *" + name + " {")
+	fmt.Fprintln(w, "func (it *" + names["Base"] + "Iterator) Next() *" + names["Base"] + " {")
 	fmt.Fprintln(w, "	if it.packs[it.index-1] == nil {")
 	fmt.Fprintln(w, "		for i, d := range it.packs {")
 	fmt.Fprintln(w, "			fmt.Println(\"i =\", i, d)")
@@ -149,17 +149,17 @@ func iterEnd(w io.Writer) {
 
 func iterAppend(w io.Writer) {
 	fmt.Fprintln(w, "// enforces no duplicate Refname names")
-	fmt.Fprintln(w, "func (all *GitTags) Append(newP *GitTag) bool {")
+	fmt.Fprintln(w, "func (all *" + names["Bases"] + ") Append(newP *" + names["Base"] + ") bool {")
 	fmt.Fprintln(w, "	" + names["lock"] + ".Lock()")
 	fmt.Fprintln(w, "	defer " + names["lock"] + ".Unlock()")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	for _, p := range all.GitTags {")
+	fmt.Fprintln(w, "	for _, p := range all." + names["Bases"] + " {")
 	fmt.Fprintln(w, "		if p.Refname == newP.Refname {")
 	fmt.Fprintln(w, "			return false")
 	fmt.Fprintln(w, "		}")
 	fmt.Fprintln(w, "	}")
 	fmt.Fprintln(w, "")
-	fmt.Fprintln(w, "	all.GitTags = append(all.GitTags, newP)")
+	fmt.Fprintln(w, "	all." + names["Bases"] + " = append(all." + names["Bases"] + ", newP)")
 	fmt.Fprintln(w, "	return true")
 	fmt.Fprintln(w, "}")
 	fmt.Fprintln(w, "")