diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php
index 24c3e3553..f9456f262 100644
--- a/airtime_mvc/application/models/airtime/CcFiles.php
+++ b/airtime_mvc/application/models/airtime/CcFiles.php
@@ -84,8 +84,7 @@ class CcFiles extends BaseCcFiles {
     
     public function getAbsoluteFilePath()
     {
-        $music_dir = Application_Model_MusicDir::getDirByPK($this->
-            _file->getDbDirectory());
+        $music_dir = Application_Model_MusicDir::getDirByPK($this->getDbDirectory());
         if (!$music_dir) {
             throw new Exception("Invalid music_dir for file in database.");
         }
diff --git a/airtime_mvc/application/models/airtime/CloudFile.php b/airtime_mvc/application/models/airtime/CloudFile.php
index bf6330d11..c1780d11c 100644
--- a/airtime_mvc/application/models/airtime/CloudFile.php
+++ b/airtime_mvc/application/models/airtime/CloudFile.php
@@ -28,7 +28,7 @@ class CloudFile extends BaseCloudFile
     
     public function getFilename()
     {
-        return $this->getResourceId();
+        return $this->getDbFilepath();
     }
     
     public function isValidFile()