diff --git a/lang/en_utf8/activitynames.php b/filter/activitynames/lang/en_utf8/filter_activitynames.php
similarity index 100%
rename from lang/en_utf8/activitynames.php
rename to filter/activitynames/lang/en_utf8/filter_activitynames.php
diff --git a/lang/en_utf8/algebra.php b/filter/algebra/lang/en_utf8/filter_algebra.php
similarity index 100%
rename from lang/en_utf8/algebra.php
rename to filter/algebra/lang/en_utf8/filter_algebra.php
diff --git a/filter/censor/filter.php b/filter/censor/filter.php
index 72b8c2ef08b69..8466e57e9e82b 100644
--- a/filter/censor/filter.php
+++ b/filter/censor/filter.php
@@ -33,7 +33,7 @@ function filter($text){
         if (empty($words)) {
             $words = array();
             if (empty($CFG->filter_censor_badwords)) {
-                $badwords = explode(',',get_string('badwords','censor'));
+                $badwords = explode(',',get_string('badwords', 'filter_censor'));
             }
             else {
                 $badwords = explode(',', $CFG->filter_censor_badwords);
diff --git a/lang/en_utf8/censor.php b/filter/censor/lang/en_utf8/filter_censor.php
similarity index 100%
rename from lang/en_utf8/censor.php
rename to filter/censor/lang/en_utf8/filter_censor.php
diff --git a/lang/en_utf8/emailprotect.php b/filter/emailprotect/lang/en_utf8/filter_emailprotect.php
similarity index 100%
rename from lang/en_utf8/emailprotect.php
rename to filter/emailprotect/lang/en_utf8/filter_emailprotect.php
diff --git a/filter/mediaplugin/filter.php b/filter/mediaplugin/filter.php
index de0af5b27fccc..6b7ed16e35bb9 100644
--- a/filter/mediaplugin/filter.php
+++ b/filter/mediaplugin/filter.php
@@ -150,7 +150,7 @@ function mediaplugin_filter_mp3_callback($link) {
 
     $jsoutput = create_ufo_inline($id, $args);
 
-    $output = $link[0].'<span class="mediaplugin mediaplugin_mp3" id="'.$id.'">('.get_string('mp3audio', 'mediaplugin').')</span>'.$jsoutput;
+    $output = $link[0].'<span class="mediaplugin mediaplugin_mp3" id="'.$id.'">('.get_string('mp3audio', 'filter_mediaplugin').')</span>'.$jsoutput;
 
     return $output;
 }
@@ -176,7 +176,7 @@ function mediaplugin_filter_swf_callback($link) {
 
     $jsoutput = create_ufo_inline($id, $args);
     
-    $output = $link[0].'<span class="mediaplugin mediaplugin_swf" id="'.$id.'">('.get_string('flashanimation', 'mediaplugin').')</span>'.$jsoutput;
+    $output = $link[0].'<span class="mediaplugin mediaplugin_swf" id="'.$id.'">('.get_string('flashanimation', 'filter_mediaplugin').')</span>'.$jsoutput;
 
     return $output;
 }
@@ -203,7 +203,7 @@ function mediaplugin_filter_flv_callback($link) {
     $args['allowfullscreen'] = 'true';
     $jsoutput = create_ufo_inline($id, $args);
 
-    $output = $link[0].'<span class="mediaplugin mediaplugin_flv" id="'.$id.'">('.get_string('flashvideo', 'mediaplugin').')</span>'.$jsoutput;
+    $output = $link[0].'<span class="mediaplugin mediaplugin_flv" id="'.$id.'">('.get_string('flashvideo', 'filter_mediaplugin').')</span>'.$jsoutput;
 
     return $output;
 }
diff --git a/lang/en_utf8/mediaplugin.php b/filter/mediaplugin/lang/en_utf8/filter_mediaplugin.php
similarity index 100%
rename from lang/en_utf8/mediaplugin.php
rename to filter/mediaplugin/lang/en_utf8/filter_mediaplugin.php
diff --git a/lang/en_utf8/multilang.php b/filter/multilang/lang/en_utf8/filter_multilang.php
similarity index 100%
rename from lang/en_utf8/multilang.php
rename to filter/multilang/lang/en_utf8/filter_multilang.php
diff --git a/lang/en_utf8/tex.php b/filter/tex/lang/en_utf8/filter_tex.php
similarity index 100%
rename from lang/en_utf8/tex.php
rename to filter/tex/lang/en_utf8/filter_tex.php