diff --git a/src/services/rename.ts b/src/services/rename.ts
index cfe79679fb..ca46a93f3c 100644
--- a/src/services/rename.ts
+++ b/src/services/rename.ts
@@ -38,9 +38,17 @@ namespace ts.Rename {
                     return undefined;
                 }
 
-                const displayName = stripQuotes(getDeclaredName(typeChecker, symbol, node));
                 const kind = SymbolDisplay.getSymbolKind(typeChecker, symbol, node);
-                return kind ? getRenameInfoSuccess(displayName, typeChecker.getFullyQualifiedName(symbol), kind, SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile) : undefined;
+                if (!kind) {
+                    return undefined;
+                }
+
+                const specifierName = (isImportOrExportSpecifierName(node) || isStringOrNumericLiteral(node) && node.parent.kind === SyntaxKind.ComputedPropertyName)
+                    ? stripQuotes(getTextOfIdentifierOrLiteral(node))
+                    : undefined;
+                const displayName = specifierName || typeChecker.symbolToString(symbol);
+                const fullDisplayName = specifierName || typeChecker.getFullyQualifiedName(symbol);
+                return getRenameInfoSuccess(displayName, fullDisplayName, kind, SymbolDisplay.getSymbolModifiers(symbol), node, sourceFile);
             }
         }
         else if (node.kind === SyntaxKind.StringLiteral) {
diff --git a/src/services/utilities.ts b/src/services/utilities.ts
index 140873dc06..b517800552 100644
--- a/src/services/utilities.ts
+++ b/src/services/utilities.ts
@@ -1278,19 +1278,6 @@ namespace ts {
         });
     }
 
-    export function getDeclaredName(typeChecker: TypeChecker, symbol: Symbol, location: Node): string {
-        // If this is an export or import specifier it could have been renamed using the 'as' syntax.
-        // If so we want to search for whatever is under the cursor.
-        if (isImportOrExportSpecifierName(location) || isStringOrNumericLiteral(location) && location.parent.kind === SyntaxKind.ComputedPropertyName) {
-            return getTextOfIdentifierOrLiteral(location);
-        }
-
-        // Try to get the local symbol if we're dealing with an 'export default'
-        // since that symbol has the "true" name.
-        const localExportDefaultSymbol = getLocalSymbolForExportDefault(symbol);
-        return typeChecker.symbolToString(localExportDefaultSymbol || symbol);
-    }
-
     export function isImportOrExportSpecifierName(location: Node): location is Identifier {
         return location.parent &&
             (location.parent.kind === SyntaxKind.ImportSpecifier || location.parent.kind === SyntaxKind.ExportSpecifier) &&