diff --git a/indra/newview/llinventorybackup.cpp b/indra/newview/llinventorybackup.cpp
index 6963d4ff9..749c7fc36 100644
--- a/indra/newview/llinventorybackup.cpp
+++ b/indra/newview/llinventorybackup.cpp
@@ -175,7 +175,7 @@ ESaveFilter LLInventoryBackup::getSaveFilter(LLInventoryItem* item)
 		return FFSAVE_OGG;
 	case LLAssetType::AT_SCRIPT:
 	case LLAssetType::AT_LSL_TEXT:
-		return FFSAVE_LSL;
+		return FFSAVE_SCRIPT;
 	case LLAssetType::AT_ANIMATION:
 		return FFSAVE_ANIMATN;
 	case LLAssetType::AT_GESTURE:
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index 16eef86fd..bf2bd3fb4 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -1811,7 +1811,7 @@ void LLPreviewLSL::saveAs()
 	}
 
 	AIFilePicker* filepicker = AIFilePicker::create();
-	filepicker->open(default_filename, FFSAVE_LSL);
+	filepicker->open(default_filename, FFSAVE_SCRIPT);
 	filepicker->run(boost::bind(&LLPreviewLSL::saveAs_continued, this, filepicker));
 }
 
@@ -2774,7 +2774,7 @@ void LLLiveLSLEditor::saveAs()
 	}
 
 	AIFilePicker* filepicker = AIFilePicker::create();
-	filepicker->open(default_filename, FFSAVE_LSL);
+	filepicker->open(default_filename, FFSAVE_SCRIPT);
 	filepicker->run(boost::bind(&LLLiveLSLEditor::saveAs_continued, this, filepicker));
 }
 
diff --git a/indra/newview/statemachine/aifilepicker.cpp b/indra/newview/statemachine/aifilepicker.cpp
index d7a57949a..a8f6b2a6b 100644
--- a/indra/newview/statemachine/aifilepicker.cpp
+++ b/indra/newview/statemachine/aifilepicker.cpp
@@ -167,8 +167,8 @@ void AIFilePicker::open(ELoadFilter filter, std::string const& default_path, std
 	  case FFLOAD_COLLADA:
 		  mFilter = "collada";
 		  break;
-	  case FFLOAD_LSL:
-		  mFilter = "lsl";
+	  case FFLOAD_SCRIPT:
+		  mFilter = "script";
 		  break;
 	  case FFLOAD_DICTIONARY:
 		  mFilter = "dictionary";
@@ -246,8 +246,8 @@ void AIFilePicker::open(std::string const& filename, ESaveFilter filter, std::st
 		case FFSAVE_GESTURE:
 			mFilter = "gesture";
 			break;
-		case FFSAVE_LSL:
-			mFilter = "lsl";
+		case FFSAVE_SCRIPT:
+			mFilter = "script";
 			break;
 		case FFSAVE_SHAPE:
 			mFilter = "shape";
diff --git a/indra/newview/statemachine/aifilepicker.h b/indra/newview/statemachine/aifilepicker.h
index af3850e31..a56a8677f 100644
--- a/indra/newview/statemachine/aifilepicker.h
+++ b/indra/newview/statemachine/aifilepicker.h
@@ -48,7 +48,7 @@ enum ELoadFilter
 	FFLOAD_RAW,
 	FFLOAD_MODEL,
 	FFLOAD_COLLADA,
-	FFLOAD_LSL,
+	FFLOAD_SCRIPT,
 	FFLOAD_DICTIONARY,
 	FFLOAD_INVGZ,
 	FFLOAD_AO,
@@ -69,7 +69,7 @@ enum ESaveFilter
 	FFSAVE_J2C,
 	FFSAVE_PNG,
 	FFSAVE_JPEG,
-	FFSAVE_LSL,
+	FFSAVE_SCRIPT,
 	FFSAVE_ANIMATN,
 	FFSAVE_OGG,
 	FFSAVE_NOTECARD,
diff --git a/indra/plugins/filepicker/basic_plugin_filepicker.cpp b/indra/plugins/filepicker/basic_plugin_filepicker.cpp
index 72b0a8b3e..6a5e20b33 100644
--- a/indra/plugins/filepicker/basic_plugin_filepicker.cpp
+++ b/indra/plugins/filepicker/basic_plugin_filepicker.cpp
@@ -88,8 +88,8 @@ static LLFilePicker::ESaveFilter str2savefilter(std::string const& filter)
 	return LLFilePicker::FFSAVE_PNG;
   else if (filter == "jpeg")
 	return LLFilePicker::FFSAVE_JPEG;
-  else if (filter == "lsl")
-	return LLFilePicker::FFSAVE_LSL;
+  else if (filter == "script")
+	return LLFilePicker::FFSAVE_SCRIPT;
   else if (filter == "animatn")
 	return LLFilePicker::FFSAVE_ANIMATN;
   else if (filter == "ogg")
@@ -161,8 +161,8 @@ static LLFilePicker::ELoadFilter str2loadfilter(std::string const& filter)
 	return LLFilePicker::FFLOAD_MODEL;
   else if (filter == "collada")
 	return LLFilePicker::FFLOAD_COLLADA;
-  else if (filter == "lsl")
-	return LLFilePicker::FFLOAD_LSL;
+  else if (filter == "script")
+	return LLFilePicker::FFLOAD_SCRIPT;
   else if (filter == "dictionary")
 	return LLFilePicker::FFLOAD_DICTIONARY;
   else if (filter == "invgz")
diff --git a/indra/plugins/filepicker/llfilepicker.cpp b/indra/plugins/filepicker/llfilepicker.cpp
index 790c32bfc..75bc89013 100644
--- a/indra/plugins/filepicker/llfilepicker.cpp
+++ b/indra/plugins/filepicker/llfilepicker.cpp
@@ -194,7 +194,7 @@ bool LLFilePickerBase::setupFilter(ELoadFilter filter)
 		mOFN.lpstrFilter = MODEL_FILTER \
 			L"\0";
 		break;
-	case FFLOAD_LSL:
+	case FFLOAD_SCRIPT:
 		mOFN.lpstrFilter = SCRIPT_FILTER \
 			L"\0";
 		break;
@@ -504,7 +504,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
 			L"Gestures (*.gesture)\0*.gesture\0" \
 			L"\0";
 		break;
-	case FFSAVE_LSL:
+	case FFSAVE_SCRIPT:
 		if(filename.empty())
 		{
 			wcsncpy( mFilesW,L"untitled.lsl", FILENAME_BUFFER_SIZE);
@@ -822,7 +822,7 @@ Boolean LLFilePickerBase::navOpenFilterProc(AEDesc *theItem, void *info, void *c
 								result = false;
 							}
 						}
-						else if (filter == FFLOAD_LSL)
+						else if (filter == FFLOAD_SCRIPT)
 						{
 							if (fileInfo.filetype != 'LSL ' &&
 								(fileInfo.extension && (CFStringCompare(fileInfo.extension, CFSTR("lsl"), kCFCompareCaseInsensitive) != kCFCompareEqualTo)) )
@@ -1030,7 +1030,7 @@ OSStatus	LLFilePickerBase::doNavSaveDialog(ESaveFilter filter, std::string const
 			extension = CFSTR(".j2c");
 			break;
 		
-		case FFSAVE_LSL:
+		case FFSAVE_SCRIPT:
 			type = 'LSL ';
 			creator = '\?\?\?\?';
 			extension = CFSTR(".lsl");
@@ -1489,7 +1489,7 @@ bool LLFilePickerBase::getSaveFile(ESaveFilter filter, std::string const& filena
 				 LLTrans::getString("compressed_image_files") + " (*.j2c)");
 			suggest_ext = ".j2c";
 			break;
-		case FFSAVE_LSL:
+		case FFSAVE_SCRIPT:
 			caption += add_script_filter_to_gtkchooser(picker);
 			suggest_ext = ".lsl";
 			break;
@@ -1553,7 +1553,7 @@ bool LLFilePickerBase::getLoadFile(ELoadFilter filter, std::string const& folder
 		case FFLOAD_IMAGE:
 			filtername = add_imageload_filter_to_gtkchooser(picker);
 			break;
-		case FFLOAD_LSL:
+		case FFLOAD_SCRIPT:
 			filtername = add_script_filter_to_gtkchooser(picker);
 			break;
 		case FFLOAD_DICTIONARY:
diff --git a/indra/plugins/filepicker/llfilepicker.h b/indra/plugins/filepicker/llfilepicker.h
index a5ff46228..cb5a5f24d 100644
--- a/indra/plugins/filepicker/llfilepicker.h
+++ b/indra/plugins/filepicker/llfilepicker.h
@@ -62,7 +62,7 @@ public:
 		FFLOAD_RAW = 8,
 		FFLOAD_MODEL = 9,
 		FFLOAD_COLLADA = 10,
-		FFLOAD_LSL = 11,
+		FFLOAD_SCRIPT = 11,
 		FFLOAD_DICTIONARY = 12,
 		// <edit>
 		FFLOAD_INVGZ = 13,
@@ -88,7 +88,7 @@ public:
 		FFSAVE_J2C = 12,
 		FFSAVE_PNG = 13,
 		FFSAVE_JPEG = 14,
-		FFSAVE_LSL = 15,
+		FFSAVE_SCRIPT = 15,
 		// <edit>
 		FFSAVE_ANIMATN = 16,
 		FFSAVE_OGG = 17,