Adapted naming

mph/client.py

@@ -186,9 +186,9 @@ def load(self, file, reload=False):
         file = Path(file)
 
         # Check if model is already loaded
-        if file in self.modelFiles() and not reload:
-            logger.info('Found model in memory')
-            return self.models()[self.modelFiles().index(file)]
+        if file in self.paths() and not reload:
+            logger.info('Found model in memory, returning model from memory')
+            return self.models()[self.paths().index(file)]
 
         tag = self.java.uniquetag('model')
         logger.info(f'Loading model "{file.name}".')
@@ -220,9 +220,9 @@ def models(self):
         """Returns all model objects currently held in memory."""
         return [Model(self.java.model(tag)) for tag in self.java.tags()]
 
-    def modelFiles(self):
+    def paths(self):
         """
-        Returns the file pathes of all models in memory (abspath). Models without
+        Returns the file paths of all models in memory (abspath). Models without
         files will return empty path.
         """
         return [Path(str(self.java.model(tag).getFilePath())) for tag in self.java.tags()]

mph/model.py

@@ -65,6 +65,10 @@ def name(self):
             name = name.rsplit('.', maxsplit=1)[0]
         return name
 
+    def path(self):
+        """Returns the abspath of the model's mpf file"""
+        return Path(str(self.java.getFilePath()))
+
     def parameters(self):
         """
         Returns the global model parameters.