diff --git a/CodeSmith/CSharp/ApiGenerate/Application.cst b/CodeSmith/CSharp/ApiGenerate/Application.cst
index afb62fa7..341b1799 100644
--- a/CodeSmith/CSharp/ApiGenerate/Application.cst
+++ b/CodeSmith/CSharp/ApiGenerate/Application.cst
@@ -29,7 +29,7 @@ using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {
-    public class <%=Table.Name%>App : BaseApp<<%=Table.Name%>, OpenAuthDBContext>
+    public class <%=Table.Name%>App : BaseStringApp<<%=Table.Name%>, OpenAuthDBContext>
     {
         private RevelanceManagerApp _revelanceApp;
 
diff --git a/CodeSmith/CSharp/Internal/Entity.Generated.cst b/CodeSmith/CSharp/Internal/Entity.Generated.cst
index ba085a78..c6776f2c 100644
--- a/CodeSmith/CSharp/Internal/Entity.Generated.cst
+++ b/CodeSmith/CSharp/Internal/Entity.Generated.cst
@@ -37,7 +37,7 @@ namespace <%= EntityNamespace %>
 	/// <%= Table.Description %>
 	/// </summary>
     [Table("<%= Table.Name%>")]
-    public partial class <%= Table.Name %> : Entity
+    public partial class <%= Table.Name %> : StringEntity
     {
         public <%= Table.Name %>()
         {