Type name override

Improve the name of the method that allows us to override the type name.
Offically we would like to call ModelInfo - Model, but Model already
exists and I don't want Model to also become a type delta. Model is
both a entity for state and an entity for connections and to become an
entity for deltas seems like a bit too much.

Author: SimonRichardson

juju/model.py

@@ -304,8 +304,8 @@ def entity_type(self):
         # Allow the overriding of entity names from the type instead of from
         # the class name. Useful because Model and ModelInfo clash and we really
         # want ModelInfo to be called Model.
-        if hasattr(self.__class__, "entity_name") and callable(self.__class__.entity_name):
-            return self.__class__.entity_name()
+        if hasattr(self.__class__, "type_name_override") and callable(self.__class__.type_name_override):
+            return self.__class__.type_name_override()
 
         def first_lower(s):
             if len(s) == 0:
@@ -2300,5 +2300,5 @@ def tag(self):
         return tag.model(self.uuid)
 
     @staticmethod
-    def entity_name():
+    def type_name_override():
         return "model"