diff --git a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
index 8653464b258..e0a072f343d 100644
--- a/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
+++ b/analysis/analysis-api/src/org/jetbrains/kotlin/analysis/api/symbols/DebugSymbolRenderer.kt
@@ -117,16 +117,7 @@ public object DebugSymbolRenderer {
     }
 
     private fun Block.renderConstantValue(value: KtConstantValue) {
-        when (value) {
-            is KtLiteralConstantValue<*> -> renderValue(value.value)
-            is KtEnumEntryConstantValue -> {
-                append(KtEnumEntryConstantValue::class.java.simpleName)
-                append("(")
-                renderValue(value.callableId)
-                append(")")
-            }
-            else -> append(value::class.java.simpleName)
-        }
+        append(KtConstantValueRenderer.render(value))
     }
 
     private fun Block.renderNamedConstantValue(value: KtNamedConstantValue) {
diff --git a/analysis/analysis-api/testData/annotations/annotationsOnDeclaration/deprecated.txt b/analysis/analysis-api/testData/annotations/annotationsOnDeclaration/deprecated.txt
index ff55fa20e6d..eea243bf2d5 100644
--- a/analysis/analysis-api/testData/annotations/annotationsOnDeclaration/deprecated.txt
+++ b/analysis/analysis-api/testData/annotations/annotationsOnDeclaration/deprecated.txt
@@ -1,5 +1,5 @@
 KtDeclaration: KtNamedFunction foo
 annotations: [
-  kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = deprecated)
+  kotlin/Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "deprecated")
     psi: KtAnnotationEntry
 ]
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
index 3fc35485290..c512035d3c1 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/Int.txt
@@ -852,7 +852,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
@@ -881,7 +881,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
@@ -910,7 +910,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
@@ -939,7 +939,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
@@ -968,7 +968,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
@@ -997,7 +997,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/SinceKotlin(version = 1.1)
+    kotlin/SinceKotlin(version = "1.1")
       psi: null
   ]
   callableIdIfNonLocal: kotlin/Int.rem
diff --git a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
index f7f169cc8ac..816ca2cea41 100644
--- a/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
+++ b/analysis/analysis-api/testData/scopes/memberScopeByFqName/java.lang.String.txt
@@ -284,7 +284,7 @@ KtFunctionSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = Deprecated in Java)
+    kotlin/Deprecated(message = "Deprecated in Java")
       psi: null
   ]
   callableIdIfNonLocal: java/lang/String.getBytes
@@ -1632,7 +1632,7 @@ KtConstructorSymbol:
 
 KtConstructorSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = Deprecated in Java)
+    kotlin/Deprecated(message = "Deprecated in Java")
       psi: null
   ]
   callableIdIfNonLocal: null
@@ -1656,7 +1656,7 @@ KtConstructorSymbol:
 
 KtConstructorSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = Deprecated in Java)
+    kotlin/Deprecated(message = "Deprecated in Java")
       psi: null
   ]
   callableIdIfNonLocal: null
@@ -1851,7 +1851,7 @@ KtConstructorSymbol:
 
 KtConstructorSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = Deprecated in Java)
+    kotlin/Deprecated(message = "Deprecated in Java")
       psi: null
   ]
   callableIdIfNonLocal: null
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
index a29f9a6e42f..04b6c642c0b 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/annotations.txt
@@ -66,7 +66,7 @@ KtNamedClassOrObjectSymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    Anno(param1 = funparam, param2 = 3)
+    Anno(param1 = "funparam", param2 = 3)
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /X.x
@@ -93,7 +93,7 @@ KtFunctionSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    Anno(param1 = param, param2 = 2)
+    Anno(param1 = "param", param2 = 2)
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: X
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
index ad905b6a6fe..ac16e43e3fc 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.descriptors.txt
@@ -1,6 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use i)
+    kotlin/Deprecated(message = "don't use i")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /i
@@ -127,7 +127,7 @@ KtKotlinPropertySymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use f)
+    kotlin/Deprecated(message = "don't use f")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /f
@@ -153,7 +153,7 @@ KtFunctionSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use MyClass)
+    kotlin/Deprecated(message = "don't use MyClass")
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: MyClass
@@ -177,7 +177,7 @@ KtNamedClassOrObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use i2)
+    kotlin/Deprecated(message = "don't use i2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.i2
@@ -212,7 +212,7 @@ KtKotlinPropertySymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use f2)
+    kotlin/Deprecated(message = "don't use f2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.f2
@@ -260,7 +260,7 @@ KtNamedClassOrObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j)
+    kotlin/Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j
@@ -294,7 +294,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2)
+    kotlin/Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j2
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
index 01b88addd66..46f63fc0efb 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/deprecated.txt
@@ -1,6 +1,6 @@
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use i)
+    kotlin/Deprecated(message = "don't use i")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /i
@@ -127,7 +127,7 @@ KtKotlinPropertySymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use f)
+    kotlin/Deprecated(message = "don't use f")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /f
@@ -153,7 +153,7 @@ KtFunctionSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use MyClass)
+    kotlin/Deprecated(message = "don't use MyClass")
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: MyClass
@@ -177,7 +177,7 @@ KtNamedClassOrObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use i2)
+    kotlin/Deprecated(message = "don't use i2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.i2
@@ -212,7 +212,7 @@ KtKotlinPropertySymbol:
 
 KtFunctionSymbol:
   annotationsList: [
-    kotlin/Deprecated(message = don't use f2)
+    kotlin/Deprecated(message = "don't use f2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /Foo.f2
@@ -260,7 +260,7 @@ KtNamedClassOrObjectSymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.ERROR), message = don't use j)
+    kotlin/Deprecated(level = kotlin.DeprecationLevel.ERROR, message = "don't use j")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j
@@ -294,7 +294,7 @@ KtKotlinPropertySymbol:
 
 KtKotlinPropertySymbol:
   annotationsList: [
-    kotlin/Deprecated(level = KtEnumEntryConstantValue(kotlin/DeprecationLevel.HIDDEN), message = don't use j2)
+    kotlin/Deprecated(level = kotlin.DeprecationLevel.HIDDEN, message = "don't use j2")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: /j2
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
index ecae80dbe70..5e84dfabe44 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.descriptors.txt
@@ -32,7 +32,7 @@ KtKotlinPropertySymbol:
 
 KtPropertyGetterSymbol:
   annotationsList: [
-    kotlin/jvm/JvmName(name = getMyJ)
+    kotlin/jvm/JvmName(name = "getMyJ")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
@@ -67,7 +67,7 @@ KtValueParameterSymbol:
 
 KtPropertySetterSymbol:
   annotationsList: [
-    kotlin/jvm/JvmName(name = setMyJ)
+    kotlin/jvm/JvmName(name = "setMyJ")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
index a2b08fb45f2..d9d5bd11682 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/jvmName.txt
@@ -32,7 +32,7 @@ KtKotlinPropertySymbol:
 
 KtPropertyGetterSymbol:
   annotationsList: [
-    kotlin/jvm/JvmName(name = getMyJ)
+    kotlin/jvm/JvmName(name = "getMyJ")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
@@ -66,7 +66,7 @@ KtValueParameterSymbol:
 
 KtPropertySetterSymbol:
   annotationsList: [
-    kotlin/jvm/JvmName(name = setMyJ)
+    kotlin/jvm/JvmName(name = "setMyJ")
       psi: KtAnnotationEntry
   ]
   callableIdIfNonLocal: null
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
index 838f2801dc3..f68e4780b94 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.descriptors.txt
@@ -1,6 +1,6 @@
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
+    kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno1
@@ -24,7 +24,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
+    kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno2
@@ -48,7 +48,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
+    kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno3
@@ -72,7 +72,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtArrayConstantValue)
+    kotlin/annotation/Target(allowedTargets = [kotlin.annotation.AnnotationTarget.TYPE])
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno4
diff --git a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
index a95fa42b153..93eae2a10e7 100644
--- a/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
+++ b/analysis/analysis-api/testData/symbols/symbolByPsi/typeAnnotations.txt
@@ -1,6 +1,6 @@
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
+    kotlin/annotation/Target(allowedTargets = kotlin.annotation.AnnotationTarget.TYPE)
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno1
@@ -24,7 +24,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
+    kotlin/annotation/Target(allowedTargets = kotlin.annotation.AnnotationTarget.TYPE)
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno2
@@ -48,7 +48,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
+    kotlin/annotation/Target(allowedTargets = kotlin.annotation.AnnotationTarget.TYPE)
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno3
@@ -72,7 +72,7 @@ KtNamedClassOrObjectSymbol:
 
 KtNamedClassOrObjectSymbol:
   annotationsList: [
-    kotlin/annotation/Target(allowedTargets = KtEnumEntryConstantValue(kotlin/annotation/AnnotationTarget.TYPE))
+    kotlin/annotation/Target(allowedTargets = kotlin.annotation.AnnotationTarget.TYPE)
       psi: KtAnnotationEntry
   ]
   classIdIfNonLocal: Anno4