diff --git a/src/compiler/core.ts b/src/compiler/core.ts
index 8f6ac1ddfc8..09ea2736fa2 100644
--- a/src/compiler/core.ts
+++ b/src/compiler/core.ts
@@ -188,14 +188,11 @@ module ts {
 
     export var localizedDiagnosticMessages: Map<string> = undefined;
 
-    function getLocaleSpecificMessage(message: string) {
+    export function getLocaleSpecificMessage(message: string) {
         if (ts.localizedDiagnosticMessages) {
             message = localizedDiagnosticMessages[message];
         }
 
-        /* Check to see that we got an actual value back. */
-        Debug.assert(message, "Diagnostic message does not exist in locale map.");
-
         return message;
     }
 
diff --git a/src/compiler/diagnosticInformationMap.generated.ts b/src/compiler/diagnosticInformationMap.generated.ts
index 7b0f27d6327..c074a3b4d91 100644
--- a/src/compiler/diagnosticInformationMap.generated.ts
+++ b/src/compiler/diagnosticInformationMap.generated.ts
@@ -2,9 +2,6 @@
 /// <reference path="types.ts" />
 module ts {
     export var Diagnostics = {
-        Unknown_compiler_option_0: { code: 6001, category: DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
-        File_0_not_found: { code: 6002, category: DiagnosticCategory.Error, key: "File '{0}' not found." },
-        File_0_must_have_extension_ts_or_d_ts: { code: 6003, category: DiagnosticCategory.Error, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
         Unrecognized_escape_sequence: { code: 1000, category: DiagnosticCategory.Error, key: "Unrecognized escape sequence." },
         Unexpected_character_0: { code: 1001, category: DiagnosticCategory.Error, key: "Unexpected character {0}." },
         Missing_close_quote_character: { code: 1002, category: DiagnosticCategory.Error, key: "Missing close quote character." },
@@ -339,6 +336,9 @@ module ts {
         Unable_to_open_file_0: { code: 6049, category: DiagnosticCategory.Error, key: "Unable to open file '{0}'." },
         Corrupted_locale_file_0: { code: 6050, category: DiagnosticCategory.Error, key: "Corrupted locale file {0}." },
         No_input_files_specified: { code: 6051, category: DiagnosticCategory.Error, key: "No input files specified." },
+        Unknown_compiler_option_0: { code: 6052, category: DiagnosticCategory.Error, key: "Unknown compiler option '{0}'." },
+        File_0_not_found: { code: 6053, category: DiagnosticCategory.Error, key: "File '{0}' not found." },
+        File_0_must_have_extension_ts_or_d_ts: { code: 6054, category: DiagnosticCategory.Error, key: "File '{0}' must have extension '.ts' or '.d.ts'." },
         Warn_on_expressions_and_declarations_with_an_implied_any_type: { code: 7004, category: DiagnosticCategory.Message, key: "Warn on expressions and declarations with an implied 'any' type." },
         Variable_0_implicitly_has_an_1_type: { code: 7005, category: DiagnosticCategory.Error, key: "Variable '{0}' implicitly has an '{1}' type." },
         Parameter_0_implicitly_has_an_1_type: { code: 7006, category: DiagnosticCategory.Error, key: "Parameter '{0}' implicitly has an '{1}' type." },
@@ -354,6 +354,8 @@ module ts {
         Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: DiagnosticCategory.Error, key: "Object literal's property '{0}' implicitly has an '{1}' type." },
         Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: DiagnosticCategory.Error, key: "Rest parameter '{0}' implicitly has an 'any[]' type." },
         Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: DiagnosticCategory.Error, key: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
+        You_must_rename_an_identifier: { code: 8000, category: DiagnosticCategory.Error, key: "You must rename an identifier." },
+        You_cannot_rename_this_element: { code: 8001, category: DiagnosticCategory.Error, key: "You cannot rename this element." },
         Variable_declaration_list_cannot_be_empty: { code: -9999999, category: DiagnosticCategory.Error, key: "Variable declaration list cannot be empty." },
         Digit_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "Digit expected." },
         Hexadecimal_digit_expected: { code: -9999999, category: DiagnosticCategory.Error, key: "Hexadecimal digit expected." },
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
index 02cad50d8bb..2c262f697a0 100644
--- a/src/compiler/diagnosticMessages.json
+++ b/src/compiler/diagnosticMessages.json
@@ -1,17 +1,4 @@
-{
-    "Unknown compiler option '{0}'.": {
-        "category": "Error",
-        "code": 6001
-    },
-    "File '{0}' not found.": {
-        "category": "Error",
-        "code": 6002
-    },
-    "File '{0}' must have extension '.ts' or '.d.ts'.": {
-        "category": "Error",
-        "code": 6003
-    },
-	
+{	
     "Unrecognized escape sequence.": {
         "category": "Error",
         "code": 1000
@@ -1178,6 +1165,7 @@
         "category": "Error",
         "code": 5039
     },
+
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
@@ -1254,7 +1242,6 @@
         "category": "Message",
         "code": 6027
     },
-
     "Version {0}": {
         "category": "Message",
         "code": 6029
@@ -1270,7 +1257,7 @@
     "File change detected. Compiling...": {
         "category": "Message",
         "code": 6032
-    },
+    },
     "STRING": {
         "category": "Message",
         "code": 6033
@@ -1306,8 +1293,8 @@
     "Additional locations:": {
         "category": "Message",
         "code": 6041
-    },
-    "Compilation complete. Watching for file changes.": {
+    },
+    "Compilation complete. Watching for file changes.": {
         "category": "Message",
         "code": 6042
     },
@@ -1351,6 +1338,18 @@
         "category": "Error",
         "code": 6051
     },
+    "Unknown compiler option '{0}'.": {
+        "category": "Error",
+        "code": 6052
+    },
+    "File '{0}' not found.": {
+        "category": "Error",
+        "code": 6053
+    },
+    "File '{0}' must have extension '.ts' or '.d.ts'.": {
+        "category": "Error",
+        "code": 6054
+    },
     "Warn on expressions and declarations with an implied 'any' type.": {
         "category": "Message",
         "code": 7004
@@ -1411,6 +1410,14 @@
         "category": "Error",
         "code": 7020
     },
+    "You must rename an identifier.": {
+        "category": "Error",
+        "code": 8000
+    },
+    "You cannot rename this element.": {
+        "category": "Error",
+        "code": 8001
+    },
     "Variable declaration list cannot be empty.": {
         "category": "Error",
         "code": -9999999
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
index 74b3f59bbd1..782eba4e3d1 100644
--- a/src/compiler/parser.ts
+++ b/src/compiler/parser.ts
@@ -9,7 +9,7 @@ module ts {
     export function getNodeConstructor(kind: SyntaxKind): new () => Node {
         return nodeConstructors[kind] || (nodeConstructors[kind] = objectAllocator.getNodeConstructor(kind));
     }
-
+ 
     function createRootNode(kind: SyntaxKind, pos: number, end: number, flags: NodeFlags): Node {
         var node = new (getNodeConstructor(kind))();
         node.pos = pos;
diff --git a/src/services/services.ts b/src/services/services.ts
index 963b7f9e354..0dab3cf5a3e 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2462,7 +2462,7 @@ module ts {
             getNameOrDottedNameSpan: getNameOrDottedNameSpan,
             getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
             getNavigateToItems: (searchValue) => [],
-            getRenameInfo: (fileName, position): RenameInfo => null,
+            getRenameInfo: (fileName, position): RenameInfo => RenameInfo.CreateError(getLocaleSpecificMessage(Diagnostics.You_cannot_rename_this_element.key)),
             getNavigationBarItems: getNavigationBarItems,
             getOutliningSpans: getOutliningSpans,
             getTodoComments: getTodoComments,