diff --git a/mROA.CodegenTools/DefineTemplatePart.cs b/mROA.CodegenTools/DefineTemplateSection.cs
similarity index 78%
rename from mROA.CodegenTools/DefineTemplatePart.cs
rename to mROA.CodegenTools/DefineTemplateSection.cs
index 0219e42..df97337 100644
--- a/mROA.CodegenTools/DefineTemplatePart.cs
+++ b/mROA.CodegenTools/DefineTemplateSection.cs
@@ -2,13 +2,13 @@ using System;
 
 namespace mROA.CodegenTools
 {
-    public class DefineTemplatePart : ITemplatePart, ITagged
+    public class DefineTemplateSection : ITemplateSection, ITagged
     {
         public TemplateDocument Context { get; set; }
         public string StoredText { get; }
         private readonly string _tag;
 
-        public DefineTemplatePart(string storedText, string tag, TemplateDocument context)
+        public DefineTemplateSection(string storedText, string tag, TemplateDocument context)
         {
             StoredText = storedText;
             _tag = tag;
diff --git a/mROA.CodegenTools/ITemplatePart.cs b/mROA.CodegenTools/ITemplateSection.cs
similarity index 68%
rename from mROA.CodegenTools/ITemplatePart.cs
rename to mROA.CodegenTools/ITemplateSection.cs
index 7cf847c..5a27871 100644
--- a/mROA.CodegenTools/ITemplatePart.cs
+++ b/mROA.CodegenTools/ITemplateSection.cs
@@ -1,13 +1,13 @@
 namespace mROA.CodegenTools
 {
-    public interface ITemplatePart
+    public interface ITemplateSection
     {
         TemplateDocument Context { get; set; }
         int TargetLength { get; }
         string Bake();
     }
 
-    public interface ITagged : ITemplatePart
+    public interface ITagged : ITemplateSection
     {
         string Tag { get; }
     }
diff --git a/mROA.CodegenTools/InsertTemplatePart.cs b/mROA.CodegenTools/InsertTemplatePart.cs
index 26ead20..50f6545 100644
--- a/mROA.CodegenTools/InsertTemplatePart.cs
+++ b/mROA.CodegenTools/InsertTemplatePart.cs
@@ -41,7 +41,7 @@ namespace mROA.CodegenTools
         
         public void Setup(object value)
         {
-            if (!(value is string) && !(value is ITemplatePart) )
+            if (!(value is string) && !(value is ITemplateSection) )
                 return;
             if (IsInserted(value))
                 return;
@@ -61,7 +61,7 @@ namespace mROA.CodegenTools
                 case string s:
                     return s;
                 default:
-                    return ((ITemplatePart)_insertedValue).Bake();
+                    return ((ITemplateSection)_insertedValue).Bake();
             }
         }
     }
diff --git a/mROA.CodegenTools/LinkTemplatePart.cs b/mROA.CodegenTools/LinkTemplateSection.cs
similarity index 76%
rename from mROA.CodegenTools/LinkTemplatePart.cs
rename to mROA.CodegenTools/LinkTemplateSection.cs
index d6be78a..3d82159 100644
--- a/mROA.CodegenTools/LinkTemplatePart.cs
+++ b/mROA.CodegenTools/LinkTemplateSection.cs
@@ -2,11 +2,11 @@ using System.Linq;
 
 namespace mROA.CodegenTools
 {
-    public class LinkTemplatePart : ITemplatePart
+    public class LinkTemplateSection : ITemplateSection
     {
         private readonly string _linkedTag;
 
-        public LinkTemplatePart(string linkedTag, TemplateDocument context)
+        public LinkTemplateSection(string linkedTag, TemplateDocument context)
         {
             _linkedTag = linkedTag;
             Context = context;
diff --git a/mROA.CodegenTools/LiteralTemplatePart.cs b/mROA.CodegenTools/LiteralTemplateSection.cs
similarity index 75%
rename from mROA.CodegenTools/LiteralTemplatePart.cs
rename to mROA.CodegenTools/LiteralTemplateSection.cs
index abe82a1..ce23f28 100644
--- a/mROA.CodegenTools/LiteralTemplatePart.cs
+++ b/mROA.CodegenTools/LiteralTemplateSection.cs
@@ -1,10 +1,10 @@
 namespace mROA.CodegenTools
 {
-    public class LiteralTemplatePart : ITemplatePart
+    public class LiteralTemplateSection : ITemplateSection
     {
         private string _internalText;
 
-        public LiteralTemplatePart(string internalText, TemplateDocument context)
+        public LiteralTemplateSection(string internalText, TemplateDocument context)
         {
             _internalText = internalText;
             Context = context;
diff --git a/mROA.CodegenTools/ProgrammableTextPart.cs b/mROA.CodegenTools/ProgrammableTextSection.cs
similarity index 71%
rename from mROA.CodegenTools/ProgrammableTextPart.cs
rename to mROA.CodegenTools/ProgrammableTextSection.cs
index 132bbcf..de4bb61 100644
--- a/mROA.CodegenTools/ProgrammableTextPart.cs
+++ b/mROA.CodegenTools/ProgrammableTextSection.cs
@@ -2,14 +2,14 @@ using System;
 
 namespace mROA.CodegenTools
 {
-    public class ProgrammableTextPart : ITemplatePart
+    public class ProgrammableTextSection : ITemplateSection
     {
         public TemplateDocument Context { get; set; }
         public int TargetLength => 0;
 
         private Func<object, string> _bakeFunc;
 
-        public ProgrammableTextPart(Func<object, string> bakeFunc, TemplateDocument context)
+        public ProgrammableTextSection(Func<object, string> bakeFunc, TemplateDocument context)
         {
             _bakeFunc = bakeFunc;
             Context = context;
diff --git a/mROA.CodegenTools/TemplateDocument.cs b/mROA.CodegenTools/TemplateDocument.cs
index 0f73749..19f2513 100644
--- a/mROA.CodegenTools/TemplateDocument.cs
+++ b/mROA.CodegenTools/TemplateDocument.cs
@@ -6,7 +6,7 @@ namespace mROA.CodegenTools
 {
     public class TemplateDocument
     {
-        public List<ITemplatePart> Parts { get; }
+        public List<ITemplateSection> Parts { get; }
         public object AdditionalContext { get; set; }
         public ITagged this[string tag] => Parts.OfType<ITagged>().FirstOrDefault(i => i.Tag == tag);
         public void Insert(string tag, object value)