Add check for class and property name collision

Author: Caitlin Bales (MSFT)

Templates/Android/BaseModel.template.tt

@@ -660,7 +660,7 @@ public {1} {2}{3}{4} {{";
                 propertyName.SplitCamelCase(),
                 property.Name,
                 propertyType,
-                property.SanitizePropertyName().ToLowerFirstChar());
+                property.Name.SanitizePropertyName(property).ToLowerFirstChar());
         }
         return sb.ToString();
     }
@@ -685,7 +685,7 @@ public {1} {2}{3}{4} {{";
                 ParamName(p).SplitCamelCase(),
                 ParamName(p),
                 ParamType(p),
-                p.SanitizePropertyName().ToLowerFirstChar()
+                ParamName(p).SanitizePropertyName(p).ToLowerFirstChar()
             );
         }
         return sb.ToString();
@@ -755,7 +755,7 @@ public {1} {2}{3}{4} {{";
             {0} = new {2}(response, null);
         }}
 ",
-            property.SanitizePropertyName(),
+            property.Name.SanitizePropertyName(property),
             BaseTypeCollectionResponse(property),
             TypeCollectionPage(property),
             property.GetTypeString());

Templates/Android/extensions/Enum.java.tt

@@ -17,7 +17,7 @@ public enum <#= c.Name.ToUpperFirstChar()#>
     /**
     * <#= value.Name.SplitCamelCase()#>
     */
-    <#= value.SanitizePropertyName() #>,
+    <#= value.Name.SanitizePropertyName(c) #>,
 <#
     }
 #>

src/GraphODataTemplateWriter/CodeHelpers/Android/TypeHelperAndroid.cs

@@ -84,14 +84,27 @@ public static string GetToLowerFirstCharName(this OdcmProperty property)
             return property.Name.ToLowerFirstChar();
         }
 
-        public static string SanitizePropertyName(this OdcmObject property)
+        public static string SanitizePropertyName(this string property, OdcmObject odcmProperty = null)
         {
-            if (ReservedNames.Contains(property.Name))
+            if (ReservedNames.Contains(property))
             {
-                return ReservedPrefix + property.Name;
+                return ReservedPrefix + property;
             }
 
-            return property.Name.Replace("@", string.Empty).Replace(".", "_");
+            if (odcmProperty != null && property == odcmProperty.Name.ToUpperFirstChar())
+            {
+                // Check whether the property type is the same as the class name.
+                if (odcmProperty.Projection.Type.Name.ToUpperFirstChar() == odcmProperty.Name.ToUpperFirstChar())
+                {
+                    // Name the property: {metadataName} + "Property"
+                    return string.Concat(property, "Property");
+                }
+
+                // Name the property by its type. Sanitize it in case the type is a reserved name.  
+                return odcmProperty.Projection.Type.Name.ToUpperFirstChar().SanitizePropertyName(odcmProperty);
+            }
+
+            return property.Replace("@", string.Empty).Replace(".", "_");
         }
 
         public static string GetToLowerImport(this OdcmProperty property)