diff --git a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs b/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
index e15fdfca6e..7121dad1a9 100644
--- a/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
+++ b/src/Umbraco.ModelsBuilder/Building/TextBuilder.cs
@@ -199,10 +199,10 @@ namespace Umbraco.ModelsBuilder.Building
             sb.AppendFormat("\t\tpublic new const PublishedItemType ModelItemType = PublishedItemType.{0};\n",
                 itemType);
             WriteGeneratedCodeAttribute(sb, "\t\t");
-            sb.Append("\t\tpublic new static PublishedContentType GetModelContentType()\n");
+            sb.Append("\t\tpublic new static IPublishedContentType GetModelContentType()\n");
             sb.Append("\t\t\t=> PublishedModelUtility.GetModelContentType(ModelItemType, ModelTypeAlias);\n");
             WriteGeneratedCodeAttribute(sb, "\t\t");
-            sb.AppendFormat("\t\tpublic static PublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<{0}, TValue>> selector)\n",
+            sb.AppendFormat("\t\tpublic static IPublishedPropertyType GetModelPropertyType<TValue>(Expression<Func<{0}, TValue>> selector)\n",
                 type.ClrName);
             sb.Append("\t\t\t=> PublishedModelUtility.GetModelPropertyType(GetModelContentType(), selector);\n");
             sb.Append("#pragma warning restore 0109\n\n");
diff --git a/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs b/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs
index 7bbae927d5..44b7aae0c0 100644
--- a/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs
+++ b/src/Umbraco.ModelsBuilder/Umbraco/PublishedModelUtility.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Linq;
 using System.Linq.Expressions;
 using Umbraco.Web.Composing;
@@ -40,7 +41,15 @@ namespace Umbraco.ModelsBuilder.Umbraco
             }
         }
 
-        public static IPublishedPropertyType GetModelPropertyType<TModel, TValue>(PublishedContentType contentType, Expression<Func<TModel, TValue>> selector)
+        [Obsolete("Use the overload taking IPublishedContentType instead")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static IPublishedPropertyType GetModelPropertyType<TModel, TValue>(PublishedContentType contentType,
+            Expression<Func<TModel, TValue>> selector)
+        {
+            return GetModelPropertyType((IPublishedContentType)contentType, selector);
+        }
+
+        public static IPublishedPropertyType GetModelPropertyType<TModel, TValue>(IPublishedContentType contentType, Expression<Func<TModel, TValue>> selector)
             //where TModel : PublishedContentModel // fixme PublishedContentModel _or_ PublishedElementModel
         {
             // fixme therefore, missing a check on TModel here