diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index 1ff5abf53..4f2c3ea8b 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -54,7 +54,7 @@ $pages = array(
                 'resource'	=>	'user'
             ),
             array(
-                'label'      => 'Manage Music Folders',
+                'label'      => 'Manage Media Folders',
                 'module'     => 'default',
                 'controller' => 'Preference',
                 'action'     => 'directory-config'
diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
index ca6704678..df75bb026 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -43,7 +43,7 @@
             <?php endforeach; ?>
         <?php else: ?>
             <dd class="block-display selected-item">
-                <span>You are not watching any music folders.</span>
+                <span>You are not watching any media folders.</span>
             </dd>
         <?php endif; ?>
 
diff --git a/airtime_mvc/application/views/scripts/preference/directory-config.phtml b/airtime_mvc/application/views/scripts/preference/directory-config.phtml
index eefa513f2..bdda1c46e 100644
--- a/airtime_mvc/application/views/scripts/preference/directory-config.phtml
+++ b/airtime_mvc/application/views/scripts/preference/directory-config.phtml
@@ -1,4 +1,4 @@
 <div id="watched-folder-section" class="ui-widget ui-widget-content block-shadow simple-formblock clearfix padded-strong manage-folders">
-<h2>Manage Music Folders</h2>
+<h2>Manage Media Folders</h2>
 <?php echo $this->form; ?>
 </div>