diff --git a/mythtv/libs/libmythservicecontracts/services/videoServices.h b/mythtv/libs/libmythservicecontracts/services/videoServices.h
index 1f0424b1758..303e4995cec 100644
--- a/mythtv/libs/libmythservicecontracts/services/videoServices.h
+++ b/mythtv/libs/libmythservicecontracts/services/videoServices.h
@@ -78,7 +78,7 @@ class SERVICE_PUBLIC VideoServices : public Service  //, public QScriptable ???
 
         virtual DTC::VideoMetadataInfo*     GetVideo           ( int              Id         ) = 0;
 
-        virtual DTC::VideoMetadataInfo*     GetVideoByFilename ( const QString    &Filename  ) = 0;
+        virtual DTC::VideoMetadataInfo*     GetVideoByFileName ( const QString    &FileName  ) = 0;
 
         virtual DTC::VideoLookupList*       LookupVideo        ( const QString    &Title,
                                                                  const QString    &Subtitle,
@@ -89,8 +89,8 @@ class SERVICE_PUBLIC VideoServices : public Service  //, public QScriptable ???
 
         virtual bool                        RemoveVideoFromDB  ( int              Id         ) = 0;
 
-        virtual bool                        AddVideo           ( const QString    &Filename,
-                                                                 const QString    &Host      ) = 0;
+        virtual bool                        AddVideo           ( const QString    &FileName,
+                                                                 const QString    &HostName  ) = 0;
 
         // Bluray Metadata
 
diff --git a/mythtv/programs/mythbackend/services/video.cpp b/mythtv/programs/mythbackend/services/video.cpp
index 87affdaaa4d..37c683a6aa1 100644
--- a/mythtv/programs/mythbackend/services/video.cpp
+++ b/mythtv/programs/mythbackend/services/video.cpp
@@ -151,13 +151,13 @@ DTC::VideoMetadataInfo* Video::GetVideo( int Id )
 //
 /////////////////////////////////////////////////////////////////////////////
 
-DTC::VideoMetadataInfo* Video::GetVideoByFilename( const QString &Filename )
+DTC::VideoMetadataInfo* Video::GetVideoByFileName( const QString &FileName )
 {
     VideoMetadataListManager::metadata_list videolist;
     VideoMetadataListManager::loadAllFromDatabase(videolist);
     VideoMetadataListManager *mlm = new VideoMetadataListManager();
     mlm->setList(videolist);
-    VideoMetadataListManager::VideoMetadataPtr metadata = mlm->byFilename(Filename);
+    VideoMetadataListManager::VideoMetadataPtr metadata = mlm->byFilename(FileName);
 
     if ( !metadata )
         throw( QString( "No metadata found for selected filename!." ));
@@ -307,23 +307,23 @@ bool Video::RemoveVideoFromDB( int Id )
 //
 /////////////////////////////////////////////////////////////////////////////
 
-bool Video::AddVideo( const QString &sFilename,
-                      const QString &sHost     )
+bool Video::AddVideo( const QString &sFileName,
+                      const QString &sHostName )
 {
-    if ( sHost.isEmpty() )
+    if ( sHostName.isEmpty() )
         throw( QString( "Host not provided! Local storage is deprecated and "
                         "is not supported by the API." ));
 
-    if ( sFilename.isEmpty() ||
-        (sFilename.contains("/../")) ||
-        (sFilename.startsWith("../")) )
+    if ( sFileName.isEmpty() ||
+        (sFileName.contains("/../")) ||
+        (sFileName.startsWith("../")) )
     {
         throw( QString( "Filename not provided, or fails sanity checks!" ));
     }
 
-    StorageGroup sgroup("Videos", sHost);
+    StorageGroup sgroup("Videos", sHostName);
 
-    QString fullname = sgroup.FindFile(sFilename);
+    QString fullname = sgroup.FindFile(sFileName);
 
     if ( !QFile::exists(fullname) )
         throw( QString( "Provided filename does not exist!" ));
@@ -337,23 +337,23 @@ bool Video::AddVideo( const QString &sFilename,
         hash = "";
     }
 
-    VideoMetadata newFile(sFilename, hash,
+    VideoMetadata newFile(sFileName, hash,
                           VIDEO_TRAILER_DEFAULT,
                           VIDEO_COVERFILE_DEFAULT,
                           VIDEO_SCREENSHOT_DEFAULT,
                           VIDEO_BANNER_DEFAULT,
                           VIDEO_FANART_DEFAULT,
-                          VideoMetadata::FilenameToMeta(sFilename, 1),
-                          VideoMetadata::FilenameToMeta(sFilename, 4),
+                          VideoMetadata::FilenameToMeta(sFileName, 1),
+                          VideoMetadata::FilenameToMeta(sFileName, 4),
                           QString(), VIDEO_YEAR_DEFAULT,
                           QDate::fromString("0000-00-00","YYYY-MM-DD"),
                           VIDEO_INETREF_DEFAULT, QString(),
                           VIDEO_DIRECTOR_DEFAULT, QString(), VIDEO_PLOT_DEFAULT,
                           0.0, VIDEO_RATING_DEFAULT, 0,
-                          VideoMetadata::FilenameToMeta(sFilename, 2).toInt(),
-                          VideoMetadata::FilenameToMeta(sFilename, 3).toInt(),
+                          VideoMetadata::FilenameToMeta(sFileName, 2).toInt(),
+                          VideoMetadata::FilenameToMeta(sFileName, 3).toInt(),
                           QDate::currentDate(), 0, ParentalLevel::plLowest);
-    newFile.SetHost(sHost);
+    newFile.SetHost(sHostName);
     newFile.SaveToDatabase();
 
     return true;
diff --git a/mythtv/programs/mythbackend/services/video.h b/mythtv/programs/mythbackend/services/video.h
index f1e499190b9..507c2c1cc4d 100644
--- a/mythtv/programs/mythbackend/services/video.h
+++ b/mythtv/programs/mythbackend/services/video.h
@@ -47,7 +47,7 @@ class Video : public VideoServices
 
         DTC::VideoMetadataInfo*   GetVideo           ( int      Id               );
 
-        DTC::VideoMetadataInfo*   GetVideoByFilename ( const QString  &Filename  );
+        DTC::VideoMetadataInfo*   GetVideoByFileName ( const QString  &FileName  );
 
         DTC::VideoLookupList*     LookupVideo        ( const QString    &Title,
                                                        const QString    &Subtitle,
@@ -58,8 +58,8 @@ class Video : public VideoServices
 
         bool                      RemoveVideoFromDB  ( int      Id               );
 
-        bool                      AddVideo           ( const QString  &Filename,
-                                                       const QString  &Host      );
+        bool                      AddVideo           ( const QString  &FileName,
+                                                       const QString  &HostName  );
 
         /* Bluray Methods */
 
@@ -112,9 +112,9 @@ class ScriptableVideo : public QObject
             return m_obj.GetVideo( Id );
         }
 
-        QObject* GetVideoByFilename( const QString    &Filename  )
+        QObject* GetVideoByFileName( const QString    &FileName  )
         {
-            return m_obj.GetVideoByFilename( Filename );
+            return m_obj.GetVideoByFileName( FileName );
         }
 
         QObject* LookupVideo( const QString    &Title,
@@ -133,10 +133,10 @@ class ScriptableVideo : public QObject
             return m_obj.RemoveVideoFromDB( Id );
         }
 
-        bool AddVideo( const QString  &Filename,
-                       const QString  &Host      )
+        bool AddVideo( const QString  &FileName,
+                       const QString  &HostName  )
         {
-            return m_obj.AddVideo( Filename, Host );
+            return m_obj.AddVideo( FileName, HostName );
         }
 };