From 0c2f462cb24dffdc9338dd0cdfbf1f598149f0d1 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 12 Feb 2020 10:30:38 -0600
Subject: [PATCH 1/3] Rename and move converter files

---
 .../ArrayConverter.cs}                         |  0
 .../ConcurrentQueueOfTConverter.cs}            |  0
 .../ConcurrentStackOfTConverter.cs}            |  0
 .../DictionaryDefaultConverter.cs}             |  0
 .../DictionaryOfStringTValueConverter.cs}      |  0
 .../ICollectionOfTConverter.cs}                |  0
 .../IDictionaryConverter.cs}                   |  0
 .../IDictionaryOfStringTValueConverter.cs}     |  0
 .../IEnumerableConverter.cs}                   |  0
 .../IEnumerableConverterFactory.cs}            |  0
 .../IEnumerableDefaultConverter.cs}            |  0
 .../IEnumerableOfTConverter.cs}                |  0
 .../IEnumerableWithAddMethodConverter.cs}      |  0
 .../IListConverter.cs}                         |  0
 .../IListOfTConverter.cs}                      |  0
 ...adOnlyDictionaryOfStringTValueConverter.cs} |  0
 .../ISetOfTConverter.cs}                       |  0
 ...utableDictionaryOfStringTValueConverter.cs} |  0
 .../ImmutableEnumerableOfTConverter.cs}        |  0
 .../ListOfTConverter.cs}                       |  0
 .../QueueOfTConverter.cs}                      |  0
 .../StackOfTConverter.cs}                      |  0
 .../ObjectConverterFactory.cs}                 |  0
 .../ObjectDefaultConverter.cs}                 |  0
 .../BooleanConverter.cs}                       |  0
 .../ByteArrayConverter.cs}                     |  0
 .../ByteConverter.cs}                          |  0
 .../CharConverter.cs}                          |  0
 .../DateTimeConverter.cs}                      |  0
 .../DateTimeOffsetConverter.cs}                |  0
 .../DecimalConverter.cs}                       |  0
 .../DoubleConverter.cs}                        |  0
 .../EnumConverter.cs}                          |  0
 .../EnumConverterFactory.cs}                   |  0
 .../{ => Value}/EnumConverterOptions.cs        |  0
 .../GuidConverter.cs}                          |  0
 .../Int16Converter.cs}                         |  0
 .../Int32Converter.cs}                         |  0
 .../Int64Converter.cs}                         |  0
 .../JsonElementConverter.cs}                   |  0
 .../KeyValuePairConverter.cs}                  |  0
 .../KeyValuePairConverterFactory.cs}           |  0
 .../NullableConverter.cs}                      |  0
 .../NullableConverterFactory.cs}               |  0
 .../ObjectConverter.cs}                        |  0
 .../SByteConverter.cs}                         |  0
 .../SingleConverter.cs}                        |  0
 .../StringConverter.cs}                        |  0
 .../UInt16Converter.cs}                        |  0
 .../UInt32Converter.cs}                        |  0
 .../UInt64Converter.cs}                        |  0
 .../UriConverter.cs}                           |  0
 .../JsonPreservableArrayReference.cs           | 18 ------------------
 53 files changed, 18 deletions(-)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonArrayConverter.cs => Collection/ArrayConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonConcurrentQueueOfTConverter.cs => Collection/ConcurrentQueueOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonConcurrentStackOfTConverter.cs => Collection/ConcurrentStackOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonDictionaryDefaultConverter.cs => Collection/DictionaryDefaultConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonDictionaryOfStringTValueConverter.cs => Collection/DictionaryOfStringTValueConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonICollectionOfTConverter.cs => Collection/ICollectionOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIDictionaryConverter.cs => Collection/IDictionaryConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIDictionaryOfStringTValueConverter.cs => Collection/IDictionaryOfStringTValueConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIEnumerableConverter.cs => Collection/IEnumerableConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIEnumerableConverterFactory.cs => Collection/IEnumerableConverterFactory.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIEnumerableDefaultConverter.cs => Collection/IEnumerableDefaultConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIEnumerableOfTConverter.cs => Collection/IEnumerableOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIEnumerableWithAddMethodConverter.cs => Collection/IEnumerableWithAddMethodConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIListConverter.cs => Collection/IListConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIListOfTConverter.cs => Collection/IListOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonIReadOnlyDictionaryOfStringTValueConverter.cs => Collection/IReadOnlyDictionaryOfStringTValueConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonISetOfTConverter.cs => Collection/ISetOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonImmutableDictionaryOfStringTValueConverter.cs => Collection/ImmutableDictionaryOfStringTValueConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonImmutableEnumerableOfTConverter.cs => Collection/ImmutableEnumerableOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonListOfTConverter.cs => Collection/ListOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonQueueOfTConverter.cs => Collection/QueueOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonStackOfTConverter.cs => Collection/StackOfTConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonObjectConverterFactory.cs => Object/ObjectConverterFactory.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonObjectDefaultConverter.cs => Object/ObjectDefaultConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterBoolean.cs => Value/BooleanConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterByteArray.cs => Value/ByteArrayConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterByte.cs => Value/ByteConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterChar.cs => Value/CharConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterDateTime.cs => Value/DateTimeConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterDateTimeOffset.cs => Value/DateTimeOffsetConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterDecimal.cs => Value/DecimalConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterDouble.cs => Value/DoubleConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterEnum.cs => Value/EnumConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonConverterEnum.cs => Value/EnumConverterFactory.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{ => Value}/EnumConverterOptions.cs (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterGuid.cs => Value/GuidConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterInt16.cs => Value/Int16Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterInt32.cs => Value/Int32Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterInt64.cs => Value/Int64Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterJsonElement.cs => Value/JsonElementConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterKeyValuePair.cs => Value/KeyValuePairConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonKeyValuePairConverter.cs => Value/KeyValuePairConverterFactory.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterNullable.cs => Value/NullableConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterNullableFactory.cs => Value/NullableConverterFactory.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterObject.cs => Value/ObjectConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterSByte.cs => Value/SByteConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterSingle.cs => Value/SingleConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterString.cs => Value/StringConverter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterUInt16.cs => Value/UInt16Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterUInt32.cs => Value/UInt32Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterUInt64.cs => Value/UInt64Converter.cs} (100%)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/{JsonValueConverterUri.cs => Value/UriConverter.cs} (100%)
 delete mode 100644 src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonPreservableArrayReference.cs

diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonArrayConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonArrayConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConcurrentQueueOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConcurrentQueueOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConcurrentStackOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConcurrentStackOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonDictionaryDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonDictionaryDefaultConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonDictionaryOfStringTValueConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonICollectionOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonICollectionOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIDictionaryConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIDictionaryConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIDictionaryOfStringTValueConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableConverterFactory.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableDefaultConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableWithAddMethodConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIEnumerableWithAddMethodConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIListConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIListConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIListOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIListOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIReadOnlyDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonIReadOnlyDictionaryOfStringTValueConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonISetOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonISetOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonImmutableDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonImmutableDictionaryOfStringTValueConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonImmutableEnumerableOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonImmutableEnumerableOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonListOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonListOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonQueueOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonQueueOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonStackOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonStackOfTConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonObjectConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonObjectConverterFactory.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonObjectDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonObjectDefaultConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterBoolean.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterBoolean.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterByteArray.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterByteArray.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterByte.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterByte.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterChar.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterChar.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTime.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTime.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTimeOffset.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTimeOffset.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDecimal.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDecimal.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDouble.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDouble.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterEnum.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterEnum.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonConverterEnum.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/EnumConverterOptions.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterOptions.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/EnumConverterOptions.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterOptions.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterGuid.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterGuid.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt16.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt16.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt32.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt32.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt64.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt64.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterJsonElement.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterJsonElement.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterKeyValuePair.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterKeyValuePair.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonKeyValuePairConverter.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterNullable.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterNullable.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterNullableFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterNullableFactory.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterObject.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterObject.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterSByte.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterSByte.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterSingle.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterSingle.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterString.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterString.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt16.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt16.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt32.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt32.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt64.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUInt64.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUri.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs
similarity index 100%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterUri.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonPreservableArrayReference.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonPreservableArrayReference.cs
deleted file mode 100644
index cd5cc913348053..00000000000000
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonPreservableArrayReference.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-namespace System.Text.Json
-{
-    /// <summary>
-    /// JSON objects that contain metadata properties and the nested JSON array are wrapped into this class.
-    /// </summary>
-    /// <typeparam name="T">The original type of the enumerable.</typeparam>
-    internal class JsonPreservableArrayReference<T>
-    {
-        /// <summary>
-        ///  The actual enumerable instance being preserved is extracted when we finish processing the JSON object on HandleEndObject.
-        /// </summary>
-        public T Values { get; set; } = default!;
-    }
-}

From d22a9faf6f753b4987fc8cc5cf8840bc8fa538f9 Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 12 Feb 2020 11:30:20 -0600
Subject: [PATCH 2/3] Rename converter types

---
 .../src/System.Text.Json.csproj               | 180 +++++++++---------
 .../Converters/Collection/ArrayConverter.cs   |   4 +-
 .../Collection/ConcurrentQueueOfTConverter.cs |   3 +-
 .../Collection/ConcurrentStackOfTConverter.cs |   3 +-
 .../DictionaryOfStringTValueConverter.cs      |   2 +-
 .../Collection/ICollectionOfTConverter.cs     |   4 +-
 .../Collection/IDictionaryConverter.cs        |   2 +-
 .../IDictionaryOfStringTValueConverter.cs     |   2 +-
 .../Collection/IEnumerableConverter.cs        |   4 +-
 .../Collection/IEnumerableConverterFactory.cs |  80 ++++----
 .../Collection/IEnumerableDefaultConverter.cs |   3 +-
 .../Collection/IEnumerableOfTConverter.cs     |   3 +-
 .../IEnumerableWithAddMethodConverter.cs      |   4 +-
 .../Converters/Collection/IListConverter.cs   |   3 +-
 .../Collection/IListOfTConverter.cs           |   3 +-
 ...adOnlyDictionaryOfStringTValueConverter.cs |   3 +-
 .../Converters/Collection/ISetOfTConverter.cs |   3 +-
 ...utableDictionaryOfStringTValueConverter.cs |   3 +-
 .../ImmutableEnumerableOfTConverter.cs        |   3 +-
 .../Converters/Collection/ListOfTConverter.cs |   4 +-
 .../Collection/QueueOfTConverter.cs           |   3 +-
 .../Collection/StackOfTConverter.cs           |   3 +-
 .../Object/ObjectConverterFactory.cs          |   4 +-
 .../Object/ObjectDefaultConverter.cs          |   2 +-
 .../Converters/Value/BooleanConverter.cs      |   2 +-
 .../Converters/Value/ByteArrayConverter.cs    |   2 +-
 .../Converters/Value/ByteConverter.cs         |   2 +-
 .../Converters/Value/CharConverter.cs         |   2 +-
 .../Converters/Value/DateTimeConverter.cs     |   2 +-
 .../Value/DateTimeOffsetConverter.cs          |   2 +-
 .../Converters/Value/DecimalConverter.cs      |   2 +-
 .../Converters/Value/DoubleConverter.cs       |   2 +-
 .../Converters/Value/EnumConverter.cs         |   6 +-
 .../Converters/Value/EnumConverterFactory.cs  |   8 +-
 .../Converters/Value/GuidConverter.cs         |   2 +-
 .../Converters/Value/Int16Converter.cs        |   2 +-
 .../Converters/Value/Int32Converter.cs        |   2 +-
 .../Converters/Value/Int64Converter.cs        |   2 +-
 .../Converters/Value/JsonElementConverter.cs  |   2 +-
 .../Converters/Value/KeyValuePairConverter.cs |   2 +-
 .../Value/KeyValuePairConverterFactory.cs     |   6 +-
 .../Converters/Value/NullableConverter.cs     |   4 +-
 .../Value/NullableConverterFactory.cs         |   4 +-
 .../Converters/Value/ObjectConverter.cs       |   2 +-
 .../Converters/Value/SByteConverter.cs        |   2 +-
 .../Converters/Value/SingleConverter.cs       |   2 +-
 .../Converters/Value/StringConverter.cs       |   2 +-
 .../Converters/Value/UInt16Converter.cs       |   2 +-
 .../Converters/Value/UInt32Converter.cs       |   2 +-
 .../Converters/Value/UInt64Converter.cs       |   2 +-
 .../Converters/Value/UriConverter.cs          |   2 +-
 .../Json/Serialization/ExtensionMethods.cs    |   1 -
 .../JsonSerializerOptions.Converters.cs       |  51 ++---
 .../Serialization/JsonStringEnumConverter.cs  |   4 +-
 .../tests/Serialization/OptionsTests.cs       |  46 ++---
 55 files changed, 256 insertions(+), 246 deletions(-)

diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 063ef297276a19..3ac099ac3574a3 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -16,16 +16,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
+      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
+    </Compile>
+    <Compile Include="$(CommonPath)System\HexConverter.cs">
+      <Link>Common\System\HexConverter.cs</Link>
+    </Compile>
     <Compile Include="System\Text\Json\BitStack.cs" />
-    <Compile Include="System\Text\Json\JsonCommentHandling.cs" />
-    <Compile Include="System\Text\Json\JsonConstants.cs" />
-    <Compile Include="System\Text\Json\JsonEncodedText.cs" />
-    <Compile Include="System\Text\Json\JsonException.cs" />
-    <Compile Include="System\Text\Json\JsonHelpers.cs" />
-    <Compile Include="System\Text\Json\JsonHelpers.Date.cs" />
-    <Compile Include="System\Text\Json\JsonTokenType.cs" />
-    <Compile Include="System\Text\Json\ThrowHelper.cs" />
-    <Compile Include="System\Text\Json\ThrowHelper.Serialization.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocument.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocument.DbRow.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocument.MetadataDb.cs" />
@@ -34,16 +31,38 @@
     <Compile Include="System\Text\Json\Document\JsonDocument.StackRowStack.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocument.TryGetProperty.cs" />
     <Compile Include="System\Text\Json\Document\JsonDocumentOptions.cs" />
-    <Compile Include="System\Text\Json\Document\JsonElement.cs" />
     <Compile Include="System\Text\Json\Document\JsonElement.ArrayEnumerator.cs" />
+    <Compile Include="System\Text\Json\Document\JsonElement.cs" />
     <Compile Include="System\Text\Json\Document\JsonElement.ObjectEnumerator.cs" />
     <Compile Include="System\Text\Json\Document\JsonProperty.cs" />
     <Compile Include="System\Text\Json\Document\JsonValueKind.cs" />
+    <Compile Include="System\Text\Json\JsonCommentHandling.cs" />
+    <Compile Include="System\Text\Json\JsonConstants.cs" />
+    <Compile Include="System\Text\Json\JsonEncodedText.cs" />
+    <Compile Include="System\Text\Json\JsonException.cs" />
+    <Compile Include="System\Text\Json\JsonHelpers.cs" />
+    <Compile Include="System\Text\Json\JsonHelpers.Date.cs" />
+    <Compile Include="System\Text\Json\JsonTokenType.cs" />
+    <Compile Include="System\Text\Json\Node\DuplicatePropertyNameHandlingStrategy.cs" />
+    <Compile Include="System\Text\Json\Node\JsonArray.cs" />
+    <Compile Include="System\Text\Json\Node\JsonArrayEnumerator.cs" />
+    <Compile Include="System\Text\Json\Node\JsonBoolean.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.RecursionStackFrame.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.Traversal.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.TraversalHelpers.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNodeOptions.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNull.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNumber.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObject.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObjectEnumerator.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObjectProperty.cs" />
+    <Compile Include="System\Text\Json\Node\JsonString.cs" />
     <Compile Include="System\Text\Json\Reader\ConsumeNumberResult.cs" />
     <Compile Include="System\Text\Json\Reader\ConsumeTokenResult.cs" />
+    <Compile Include="System\Text\Json\Reader\JsonReaderException.cs" />
     <Compile Include="System\Text\Json\Reader\JsonReaderHelper.cs" />
     <Compile Include="System\Text\Json\Reader\JsonReaderHelper.Unescaping.cs" />
-    <Compile Include="System\Text\Json\Reader\JsonReaderException.cs" />
     <Compile Include="System\Text\Json\Reader\JsonReaderOptions.cs" />
     <Compile Include="System\Text\Json\Reader\JsonReaderState.cs" />
     <Compile Include="System\Text\Json\Reader\Utf8JsonReader.cs" />
@@ -51,64 +70,64 @@
     <Compile Include="System\Text\Json\Reader\Utf8JsonReader.TryGet.cs" />
     <Compile Include="System\Text\Json\Serialization\ClassType.cs" />
     <Compile Include="System\Text\Json\Serialization\ConverterList.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ArrayConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ConcurrentQueueOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ConcurrentStackOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\DictionaryDefaultConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\DictionaryOfStringTValueConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ICollectionOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IDictionaryConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IDictionaryOfStringTValueConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableDefaultConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableWithAddMethodConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IListConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IListOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ImmutableDictionaryOfStringTValueConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ImmutableEnumerableOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IReadOnlyDictionaryOfStringTValueConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ISetOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\ListOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\QueueOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\StackOfTConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Object\ObjectConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Object\ObjectDefaultConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\BooleanConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\ByteArrayConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\ByteConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\CharConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\DateTimeConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\DateTimeOffsetConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\DecimalConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\DoubleConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\EnumConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\EnumConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\EnumConverterOptions.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\GuidConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\Int16Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\Int32Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\Int64Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\JsonElementConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\KeyValuePairConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\KeyValuePairConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\NullableConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\NullableConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\ObjectConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\SByteConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\SingleConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\StringConverter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\UInt16Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\UInt32Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\UInt64Converter.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Value\UriConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\DefaultReferenceResolver.cs" />
     <Compile Include="System\Text\Json\Serialization\ExtensionMethods.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\EnumConverterOptions.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonArrayConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonConcurrentQueueOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonConcurrentStackOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonConverterEnum.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonDictionaryDefaultConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonDictionaryOfStringTValueConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonICollectionOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIDictionaryConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIDictionaryOfStringTValueConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIEnumerableConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIEnumerableConverterFactory.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIEnumerableDefaultConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIEnumerableOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIEnumerableWithAddMethodConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIListConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIListOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonImmutableDictionaryOfStringTValueConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonImmutableEnumerableOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonIReadOnlyDictionaryOfStringTValueConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonISetOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonKeyValuePairConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonListOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonObjectDefaultConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonObjectConverterFactory.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonQueueOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonStackOfTConverter.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterBoolean.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterByte.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterByteArray.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterChar.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterDateTime.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterDateTimeOffset.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterDecimal.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterDouble.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterEnum.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterGuid.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterInt16.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterInt32.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterInt64.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterJsonElement.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterKeyValuePair.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterNullable.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterNullableFactory.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterObject.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterSByte.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterSingle.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterString.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterUInt16.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterUInt32.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterUInt64.cs" />
-    <Compile Include="System\Text\Json\Serialization\Converters\JsonValueConverterUri.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonAttribute.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonCamelCaseNamingPolicy.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonClassInfo.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonClassInfo.AddProperty.cs" />
+    <Compile Include="System\Text\Json\Serialization\JsonClassInfo.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonCollectionConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonConverter.ReadAhead.cs" />
@@ -125,23 +144,23 @@
     <Compile Include="System\Text\Json\Serialization\JsonPropertyInfoOfTConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonPropertyNameAttribute.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonResumableConverterOfT.cs" />
+    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.HandleMetadata.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.HandlePropertyName.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.Helpers.cs" />
+    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.Span.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.Stream.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.String.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.Span.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Read.Utf8JsonReader.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.ByteArray.cs" />
+    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.HandleMetadata.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.Helpers.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.Stream.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.String.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.Utf8JsonWriter.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.Converters.cs" />
+    <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonStringEnumConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonValueConverterOfT.cs" />
     <Compile Include="System\Text\Json\Serialization\MemberAccessor.cs" />
@@ -158,6 +177,8 @@
     <Compile Include="System\Text\Json\Serialization\StackFramePropertyState.cs" />
     <Compile Include="System\Text\Json\Serialization\WriteStack.cs" />
     <Compile Include="System\Text\Json\Serialization\WriteStackFrame.cs" />
+    <Compile Include="System\Text\Json\ThrowHelper.cs" />
+    <Compile Include="System\Text\Json\ThrowHelper.Serialization.cs" />
     <Compile Include="System\Text\Json\Writer\JsonWriterHelper.cs" />
     <Compile Include="System\Text\Json\Writer\JsonWriterHelper.Date.cs" />
     <Compile Include="System\Text\Json\Writer\JsonWriterHelper.Escaping.cs" />
@@ -192,12 +213,6 @@
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.SignedNumber.cs" />
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.String.cs" />
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.UnsignedNumber.cs" />
-    <Compile Include="$(CommonPath)System\Runtime\CompilerServices\PreserveDependencyAttribute.cs">
-      <Link>Common\System\Runtime\CompilerServices\PreserveDependencyAttribute.cs</Link>
-    </Compile>
-    <Compile Include="$(CommonPath)System\HexConverter.cs">
-      <Link>Common\System\HexConverter.cs</Link>
-    </Compile>
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' or '$(TargetsNetFx)' == 'true'">
     <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" />
@@ -235,21 +250,4 @@
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Threading.Tasks.Extensions" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="System\Text\Json\Node\DuplicatePropertyNameHandlingStrategy.cs" />
-    <Compile Include="System\Text\Json\Node\JsonArray.cs" />
-    <Compile Include="System\Text\Json\Node\JsonArrayEnumerator.cs" />
-    <Compile Include="System\Text\Json\Node\JsonBoolean.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.RecursionStackFrame.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.Traversal.cs" /> 
-    <Compile Include="System\Text\Json\Node\JsonNode.TraversalHelpers.cs" /> 
-    <Compile Include="System\Text\Json\Node\JsonNodeOptions.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNull.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNumber.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObject.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObjectEnumerator.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObjectProperty.cs" />
-    <Compile Include="System\Text\Json\Node\JsonString.cs" />
-  </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs
index 4d3e2fc2cd9e98..9b9137a3488b93 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ArrayConverter.cs
@@ -11,8 +11,8 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Converter for <cref>System.Array</cref>.
     /// </summary>
-    internal sealed class JsonArrayConverter<TCollection, TElement>
-        : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ArrayConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection: IEnumerable
     {
         internal override bool CanHaveIdMetadata => false;
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs
index 4a4a10e8e2e369..f6673fb23c580e 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentQueueOfTConverter.cs
@@ -8,7 +8,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConcurrentQueueOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ConcurrentQueueOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : ConcurrentQueue<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs
index 5321d8d7161460..c7b173dd158666 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ConcurrentStackOfTConverter.cs
@@ -8,7 +8,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConcurrentStackOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ConcurrentStackOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : ConcurrentStack<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
index ef539d201b9d6a..7e501d0c74310c 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
@@ -11,7 +11,7 @@ namespace System.Text.Json.Serialization.Converters
     /// Converter for Dictionary{string, TValue} that (de)serializes as a JSON object with properties
     /// representing the dictionary element key and value.
     /// </summary>
-    internal sealed class JsonDictionaryOfStringTValueConverter<TCollection, TValue>
+    internal sealed class DictionaryOfStringTValueConverter<TCollection, TValue>
         : JsonDictionaryDefaultConverter<TCollection, TValue>
         where TCollection : Dictionary<string, TValue>
     {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs
index 7a63ae126bcd1b..67600151d0cc34 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ICollectionOfTConverter.cs
@@ -10,8 +10,8 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Converter for <cref>System.Collections.Generic.ICollection{TElement}</cref>.
     /// </summary>
-    internal sealed class JsonICollectionOfTConverter<TCollection, TElement>
-        : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ICollectionOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : ICollection<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
index 814e1b9cc62d78..e4182a2907a719 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
@@ -12,7 +12,7 @@ namespace System.Text.Json.Serialization.Converters
     /// Converter for <cref>System.Collections.IDictionary</cref> that (de)serializes as a JSON object with properties
     /// representing the dictionary element key and value.
     /// </summary>
-    internal sealed class JsonIDictionaryConverter<TCollection>
+    internal sealed class IDictionaryConverter<TCollection>
         : JsonDictionaryDefaultConverter<TCollection, object?>
         where TCollection : IDictionary
     {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
index 41e03f178d1fe4..8798375460436f 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
@@ -11,7 +11,7 @@ namespace System.Text.Json.Serialization.Converters
     /// Converter for <cref>System.Collections.Generic.IDictionary{string, TValue}</cref> that
     /// (de)serializes as a JSON object with properties representing the dictionary element key and value.
     /// </summary>
-    internal sealed class JsonIDictionaryOfStringTValueConverter<TCollection, TValue>
+    internal sealed class IDictionaryOfStringTValueConverter<TCollection, TValue>
         : JsonDictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IDictionary<string, TValue>
     {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
index 2712385e03ec44..af72f48957ecd3 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverter.cs
@@ -12,8 +12,8 @@ namespace System.Text.Json.Serialization.Converters
     /// Converter for <cref>System.Collections.IEnumerable</cref>.
     /// </summary>
     /// <typeparam name="TCollection"></typeparam>
-    internal sealed class JsonIEnumerableConverter<TCollection>
-        : JsonIEnumerableDefaultConverter<TCollection, object?>
+    internal sealed class IEnumerableConverter<TCollection>
+        : IEnumerableDefaultConverter<TCollection, object?>
         where TCollection : IEnumerable
     {
         protected override void Add(object? value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs
index 0081359d7165bc..3d1de1343519ae 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactory.cs
@@ -16,33 +16,33 @@ namespace System.Text.Json.Serialization.Converters
     /// </summary>
     internal class JsonIEnumerableConverterFactory : JsonConverterFactory
     {
-        private static readonly JsonIDictionaryConverter<IDictionary> s_converterForIDictionary = new JsonIDictionaryConverter<IDictionary>();
-        private static readonly JsonIEnumerableConverter<IEnumerable> s_converterForIEnumerable = new JsonIEnumerableConverter<IEnumerable>();
-        private static readonly JsonIListConverter<IList> s_converterForIList = new JsonIListConverter<IList>();
+        private static readonly IDictionaryConverter<IDictionary> s_converterForIDictionary = new IDictionaryConverter<IDictionary>();
+        private static readonly IEnumerableConverter<IEnumerable> s_converterForIEnumerable = new IEnumerableConverter<IEnumerable>();
+        private static readonly IListConverter<IList> s_converterForIList = new IListConverter<IList>();
 
         public override bool CanConvert(Type typeToConvert)
         {
             return typeof(IEnumerable).IsAssignableFrom(typeToConvert);
         }
 
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonArrayConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonConcurrentQueueOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonConcurrentStackOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonDefaultArrayConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonDictionaryOfStringTValueConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonICollectionOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIDictionaryOfStringTValueConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIEnumerableOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIEnumerableWithAddMethodConverter`1")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIListConverter`1")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIListOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonImmutableDictionaryOfStringTValueConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonImmutableEnumerableOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonIReadOnlyDictionaryOfStringTValueConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonISetOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonListOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonQueueOfTConverter`2")]
-        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.JsonStackOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ArrayConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ConcurrentQueueOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ConcurrentStackOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.DefaultArrayConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.DictionaryOfStringTValueConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ICollectionOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IDictionaryOfStringTValueConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IEnumerableOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IEnumerableWithAddMethodConverter`1")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IListConverter`1")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IListOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ImmutableDictionaryOfStringTValueConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ImmutableEnumerableOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.IReadOnlyDictionaryOfStringTValueConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ISetOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.ListOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.QueueOfTConverter`2")]
+        [PreserveDependency(".ctor", "System.Text.Json.Serialization.Converters.StackOfTConverter`2")]
         public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             JsonConverter? converter = null;
@@ -60,13 +60,13 @@ public override bool CanConvert(Type typeToConvert)
                     return null;
                 }
 
-                converterType = typeof(JsonArrayConverter<,>);
+                converterType = typeof(ArrayConverter<,>);
                 elementType = typeToConvert.GetElementType();
             }
             // List<> or deriving from List<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(List<>))) != null)
             {
-                converterType = typeof(JsonListOfTConverter<,>);
+                converterType = typeof(ListOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // Dictionary<string,> or deriving from Dictionary<string,>
@@ -75,7 +75,7 @@ public override bool CanConvert(Type typeToConvert)
                 genericArgs = actualTypeToConvert.GetGenericArguments();
                 if (genericArgs[0] == typeof(string))
                 {
-                    converterType = typeof(JsonDictionaryOfStringTValueConverter<,>);
+                    converterType = typeof(DictionaryOfStringTValueConverter<,>);
                     elementType = genericArgs[1];
                 }
                 else
@@ -89,7 +89,7 @@ public override bool CanConvert(Type typeToConvert)
                 genericArgs = typeToConvert.GetGenericArguments();
                 if (genericArgs[0] == typeof(string))
                 {
-                    converterType = typeof(JsonImmutableDictionaryOfStringTValueConverter<,>);
+                    converterType = typeof(ImmutableDictionaryOfStringTValueConverter<,>);
                     elementType = genericArgs[1];
                 }
                 else
@@ -103,7 +103,7 @@ public override bool CanConvert(Type typeToConvert)
                 genericArgs = actualTypeToConvert.GetGenericArguments();
                 if (genericArgs[0] == typeof(string))
                 {
-                    converterType = typeof(JsonIDictionaryOfStringTValueConverter<,>);
+                    converterType = typeof(IDictionaryOfStringTValueConverter<,>);
                     elementType = genericArgs[1];
                 }
                 else
@@ -117,7 +117,7 @@ public override bool CanConvert(Type typeToConvert)
                 genericArgs = actualTypeToConvert.GetGenericArguments();
                 if (genericArgs[0] == typeof(string))
                 {
-                    converterType = typeof(JsonIReadOnlyDictionaryOfStringTValueConverter<,>);
+                    converterType = typeof(IReadOnlyDictionaryOfStringTValueConverter<,>);
                     elementType = genericArgs[1];
                 }
                 else
@@ -128,55 +128,55 @@ public override bool CanConvert(Type typeToConvert)
             // Immutable non-dictionaries from System.Collections.Immutable, e.g. ImmutableStack<T>
             else if (typeToConvert.IsImmutableEnumerableType())
             {
-                converterType = typeof(JsonImmutableEnumerableOfTConverter<,>);
+                converterType = typeof(ImmutableEnumerableOfTConverter<,>);
                 elementType = typeToConvert.GetGenericArguments()[0];
             }
             // IList<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(IList<>))) != null)
             {
-                converterType = typeof(JsonIListOfTConverter<,>);
+                converterType = typeof(IListOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // ISet<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(ISet<>))) != null)
             {
-                converterType = typeof(JsonISetOfTConverter<,>);
+                converterType = typeof(ISetOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // ICollection<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(ICollection<>))) != null)
             {
-                converterType = typeof(JsonICollectionOfTConverter<,>);
+                converterType = typeof(ICollectionOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // Stack<> or deriving from Stack<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(Stack<>))) != null)
             {
-                converterType = typeof(JsonStackOfTConverter<,>);
+                converterType = typeof(StackOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // Queue<> or deriving from Queue<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(Queue<>))) != null)
             {
-                converterType = typeof(JsonQueueOfTConverter<,>);
+                converterType = typeof(QueueOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // ConcurrentStack<> or deriving from ConcurrentStack<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(ConcurrentStack<>))) != null)
             {
-                converterType = typeof(JsonConcurrentStackOfTConverter<,>);
+                converterType = typeof(ConcurrentStackOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // ConcurrentQueue<> or deriving from ConcurrentQueue<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericBaseClass(typeof(ConcurrentQueue<>))) != null)
             {
-                converterType = typeof(JsonConcurrentQueueOfTConverter<,>);
+                converterType = typeof(ConcurrentQueueOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // IEnumerable<>, types assignable from List<>
             else if ((actualTypeToConvert = typeToConvert.GetCompatibleGenericInterface(typeof(IEnumerable<>))) != null)
             {
-                converterType = typeof(JsonIEnumerableOfTConverter<,>);
+                converterType = typeof(IEnumerableOfTConverter<,>);
                 elementType = actualTypeToConvert.GetGenericArguments()[0];
             }
             // Check for non-generics after checking for generics.
@@ -187,7 +187,7 @@ public override bool CanConvert(Type typeToConvert)
                     return s_converterForIDictionary;
                 }
 
-                converterType = typeof(JsonIDictionaryConverter<>);
+                converterType = typeof(IDictionaryConverter<>);
             }
             else if (typeof(IList).IsAssignableFrom(typeToConvert))
             {
@@ -196,11 +196,11 @@ public override bool CanConvert(Type typeToConvert)
                     return s_converterForIList;
                 }
 
-                converterType = typeof(JsonIListConverter<>);
+                converterType = typeof(IListConverter<>);
             }
             else if (typeToConvert.IsNonGenericStackOrQueue())
             {
-                converterType = typeof(JsonIEnumerableWithAddMethodConverter<>);
+                converterType = typeof(IEnumerableWithAddMethodConverter<>);
             }
             else
             {
@@ -210,7 +210,7 @@ public override bool CanConvert(Type typeToConvert)
                     return s_converterForIEnumerable;
                 }
 
-                converterType = typeof(JsonIEnumerableConverter<>);
+                converterType = typeof(IEnumerableConverter<>);
             }
 
             if (converterType != null)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
index b4911e45cbc656..f7d2a7311f5b89 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableDefaultConverter.cs
@@ -9,7 +9,8 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Default base class implementation of <cref>JsonIEnumerableConverter{TCollection, TElement}</cref>.
     /// </summary>
-    internal abstract class JsonIEnumerableDefaultConverter<TCollection, TElement> : JsonCollectionConverter<TCollection, TElement>
+    internal abstract class IEnumerableDefaultConverter<TCollection, TElement>
+        : JsonCollectionConverter<TCollection, TElement>
     {
         protected abstract void Add(TElement value, ref ReadStack state);
         protected abstract void CreateCollection(ref ReadStack state, JsonSerializerOptions options);
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs
index d1f2269366f9c5..21045a86e10ddb 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableOfTConverter.cs
@@ -11,7 +11,8 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Converter for <cref>System.Collections.Generic.IEnumerable{TElement}</cref>.
     /// </summary>
-    internal sealed class JsonIEnumerableOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class IEnumerableOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : IEnumerable<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs
index 55bd1b27352d49..ab11eca64f3203 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableWithAddMethodConverter.cs
@@ -7,8 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonIEnumerableWithAddMethodConverter<TCollection> :
-        JsonIEnumerableDefaultConverter<TCollection, object?>
+    internal sealed class IEnumerableWithAddMethodConverter<TCollection>
+        : IEnumerableDefaultConverter<TCollection, object?>
         where TCollection : IEnumerable
     {
         protected override void Add(object? value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs
index 71785fdc2a2f20..1e42de017fb676 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListConverter.cs
@@ -9,7 +9,8 @@
 namespace System.Text.Json.Serialization.Converters
 {
     /// Converter for <cref>System.Collections.IList</cref>.
-    internal sealed class JsonIListConverter<TCollection> : JsonIEnumerableDefaultConverter<TCollection, object>
+    internal sealed class IListConverter<TCollection>
+        : IEnumerableDefaultConverter<TCollection, object>
         where TCollection : IList
     {
         protected override void Add(object? value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs
index f227857cbb265d..a682d0e0510bf5 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IListOfTConverter.cs
@@ -10,7 +10,8 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Converter for <cref>System.Collections.Generic.IList{TElement}</cref>.
     /// </summary>
-    internal sealed class JsonIListOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class IListOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : IList<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
index 5dfcc36e064f5c..36065f28d2ef00 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonIReadOnlyDictionaryOfStringTValueConverter<TCollection, TValue> : JsonDictionaryDefaultConverter<TCollection, TValue>
+    internal sealed class IReadOnlyDictionaryOfStringTValueConverter<TCollection, TValue>
+        : JsonDictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IReadOnlyDictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs
index eb9b79e00a210c..02b77ad099e008 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ISetOfTConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonISetOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ISetOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : ISet<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
index 0e12a8e87f446e..a2cc29a690e8d1 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonImmutableDictionaryOfStringTValueConverter<TCollection, TValue> : JsonDictionaryDefaultConverter<TCollection, TValue>
+    internal sealed class ImmutableDictionaryOfStringTValueConverter<TCollection, TValue>
+        : JsonDictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IReadOnlyDictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs
index d3cd9bcd45512f..70438a939e1209 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableEnumerableOfTConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonImmutableEnumerableOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ImmutableEnumerableOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : IEnumerable<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
index 31c94131fb03ad..27f3df87d175e1 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ListOfTConverter.cs
@@ -8,8 +8,8 @@
 namespace System.Text.Json.Serialization.Converters
 {
     /// Converter for <cref>System.Collections.Generic.List{TElement}</cref>.
-    internal sealed class JsonListOfTConverter<TCollection, TElement>
-        : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class ListOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection: List<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
index a0cc38d40abb21..64feb599be5523 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/QueueOfTConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonQueueOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class QueueOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : Queue<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
index 31dac18efe1a2a..dc3502de0d4989 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/StackOfTConverter.cs
@@ -7,7 +7,8 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonStackOfTConverter<TCollection, TElement> : JsonIEnumerableDefaultConverter<TCollection, TElement>
+    internal sealed class StackOfTConverter<TCollection, TElement>
+        : IEnumerableDefaultConverter<TCollection, TElement>
         where TCollection : Stack<TElement>
     {
         protected override void Add(TElement value, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
index 00d267a7e01faa..431c6fd75d3d3a 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectConverterFactory.cs
@@ -11,7 +11,7 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Converter factory for all object-based types (non-enumerable and non-primitive).
     /// </summary>
-    internal class JsonObjectConverterFactory : JsonConverterFactory
+    internal class ObjectConverterFactory : JsonConverterFactory
     {
         public override bool CanConvert(Type typeToConvert)
         {
@@ -24,7 +24,7 @@ public override bool CanConvert(Type typeToConvert)
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
-                typeof(JsonObjectDefaultConverter<>).MakeGenericType(typeToConvert),
+                typeof(ObjectDefaultConverter<>).MakeGenericType(typeToConvert),
                 BindingFlags.Instance | BindingFlags.Public,
                 binder: null,
                 args: null,
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
index 49c701a3348d4e..a774e1dbe7e0d1 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Object/ObjectDefaultConverter.cs
@@ -9,7 +9,7 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Default base class implementation of <cref>JsonObjectConverter{T}</cref>.
     /// </summary>
-    internal sealed class JsonObjectDefaultConverter<T> : JsonObjectConverter<T>
+    internal sealed class ObjectDefaultConverter<T> : JsonObjectConverter<T>
     {
         internal override bool OnTryRead(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, ref ReadStack state, out T value)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs
index 755f4a209e61df..04da6ed163fc5d 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/BooleanConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterBoolean : JsonConverter<bool>
+    internal sealed class BooleanConverter : JsonConverter<bool>
     {
         public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs
index df478133610050..76aaaf244c0b08 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteArrayConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterByteArray : JsonConverter<byte[]>
+    internal sealed class ByteArrayConverter : JsonConverter<byte[]>
     {
         public override byte[] Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs
index b668fe41c237a4..38b8211ee36192 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ByteConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterByte : JsonConverter<byte>
+    internal sealed class ByteConverter : JsonConverter<byte>
     {
         public override byte Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs
index f225ae40395f46..5b259892c4d9ce 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/CharConverter.cs
@@ -6,7 +6,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterChar : JsonConverter<char>
+    internal sealed class CharConverter : JsonConverter<char>
     {
         public override char Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs
index cdd837f1ab8e6d..e5dbbd588271f1 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterDateTime : JsonConverter<DateTime>
+    internal sealed class DateTimeConverter : JsonConverter<DateTime>
     {
         public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs
index 268c164e907d11..927911cb7bd545 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DateTimeOffsetConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterDateTimeOffset : JsonConverter<DateTimeOffset>
+    internal sealed class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
     {
         public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs
index f951e39211e7fd..326df60822c753 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DecimalConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterDecimal : JsonConverter<decimal>
+    internal sealed class DecimalConverter : JsonConverter<decimal>
     {
         public override decimal Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs
index c53708d81e2cba..4a2acd60865c95 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/DoubleConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterDouble : JsonConverter<double>
+    internal sealed class DoubleConverter : JsonConverter<double>
     {
         public override double Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs
index 65f6dbf1980daa..6adcca1ba8d15d 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverter.cs
@@ -8,7 +8,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal class JsonConverterEnum<T> : JsonConverter<T>
+    internal class EnumConverter<T> : JsonConverter<T>
         where T : struct, Enum
     {
         private static readonly TypeCode s_enumTypeCode = Type.GetTypeCode(typeof(T));
@@ -25,12 +25,12 @@ public override bool CanConvert(Type type)
             return type.IsEnum;
         }
 
-        public JsonConverterEnum(EnumConverterOptions options)
+        public EnumConverter(EnumConverterOptions options)
             : this(options, namingPolicy: null)
         {
         }
 
-        public JsonConverterEnum(EnumConverterOptions options, JsonNamingPolicy? namingPolicy)
+        public EnumConverter(EnumConverterOptions options, JsonNamingPolicy? namingPolicy)
         {
             _converterOptions = options;
             if (namingPolicy != null)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs
index bbdd499ae62359..38ad9315e41d9d 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/EnumConverterFactory.cs
@@ -7,9 +7,9 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterEnum : JsonConverterFactory
+    internal sealed class EnumConverterFactory : JsonConverterFactory
     {
-        public JsonConverterEnum()
+        public EnumConverterFactory()
         {
         }
 
@@ -20,11 +20,11 @@ public override bool CanConvert(Type type)
 
         [PreserveDependency(
             ".ctor(System.Text.Json.Serialization.Converters.EnumConverterOptions)",
-            "System.Text.Json.Serialization.Converters.JsonConverterEnum`1")]
+            "System.Text.Json.Serialization.Converters.EnumConverter`1")]
         public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options)
         {
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
-                typeof(JsonConverterEnum<>).MakeGenericType(type),
+                typeof(EnumConverter<>).MakeGenericType(type),
                 BindingFlags.Instance | BindingFlags.Public,
                 binder: null,
                 new object[] { EnumConverterOptions.AllowNumbers },
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs
index 379fcc33beba94..3c7c010098ffdd 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/GuidConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterGuid : JsonConverter<Guid>
+    internal sealed class GuidConverter : JsonConverter<Guid>
     {
         public override Guid Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs
index 39d844feed31c0..f68e23459af7e7 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int16Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterInt16 : JsonConverter<short>
+    internal sealed class Int16Converter : JsonConverter<short>
     {
         public override short Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs
index fb4e28de1bba97..abd9089c658738 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int32Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterInt32 : JsonConverter<int>
+    internal sealed class Int32Converter : JsonConverter<int>
     {
         public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs
index 6f82397be872ed..0ea30c22a56442 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/Int64Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterInt64 : JsonConverter<long>
+    internal sealed class Int64Converter : JsonConverter<long>
     {
         public override long Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs
index b8a4da3efca796..d1962e02ca0574 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/JsonElementConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterJsonElement : JsonConverter<JsonElement>
+    internal sealed class JsonElementConverter : JsonConverter<JsonElement>
     {
         public override JsonElement Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs
index 70eb76e1102f90..a9e386e74ea83f 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverter.cs
@@ -6,7 +6,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonKeyValuePairConverter<TKey, TValue> : JsonValueConverter<KeyValuePair<TKey, TValue>>
+    internal sealed class KeyValuePairConverter<TKey, TValue> : JsonValueConverter<KeyValuePair<TKey, TValue>>
     {
         private const string KeyName = "Key";
         private const string ValueName = "Value";
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs
index 75032665f60c25..da09dbae07cbf0 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/KeyValuePairConverterFactory.cs
@@ -8,7 +8,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonKeyValuePairConverter : JsonConverterFactory
+    internal sealed class KeyValuePairConverterFactory : JsonConverterFactory
     {
         public override bool CanConvert(Type typeToConvert)
         {
@@ -19,14 +19,14 @@ public override bool CanConvert(Type typeToConvert)
             return (generic == typeof(KeyValuePair<,>));
         }
 
-        [PreserveDependency(".ctor()", "System.Text.Json.Serialization.Converters.JsonKeyValuePairConverter`2")]
+        [PreserveDependency(".ctor()", "System.Text.Json.Serialization.Converters.KeyValuePairConverter`2")]
         public override JsonConverter CreateConverter(Type type, JsonSerializerOptions options)
         {
             Type keyType = type.GetGenericArguments()[0];
             Type valueType = type.GetGenericArguments()[1];
 
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
-                typeof(JsonKeyValuePairConverter<,>).MakeGenericType(new Type[] { keyType, valueType }),
+                typeof(KeyValuePairConverter<,>).MakeGenericType(new Type[] { keyType, valueType }),
                 BindingFlags.Instance | BindingFlags.Public,
                 binder: null,
                 args: null,
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs
index 525793d5e0565f..000fcd7d000aaa 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverter.cs
@@ -4,13 +4,13 @@
 
 namespace System.Text.Json.Serialization
 {
-    internal class JsonValueConverterNullable<T> : JsonConverter<T?> where T : struct
+    internal class NullableConverter<T> : JsonConverter<T?> where T : struct
     {
         // It is possible to cache the underlying converter since this is an internal converter and
         // an instance is created only once for each JsonSerializerOptions instance.
         private readonly JsonConverter<T> _converter;
 
-        public JsonValueConverterNullable(JsonConverter<T> converter)
+        public NullableConverter(JsonConverter<T> converter)
         {
             _converter = converter;
         }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs
index 742b1843f9f74a..ffa7b6fe00d116 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/NullableConverterFactory.cs
@@ -7,7 +7,7 @@
 
 namespace System.Text.Json.Serialization
 {
-    internal class JsonValueConverterNullableFactory : JsonConverterFactory
+    internal class NullableConverterFactory : JsonConverterFactory
     {
         public override bool CanConvert(Type typeToConvert)
         {
@@ -27,7 +27,7 @@ public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializer
             }
 
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
-                typeof(JsonValueConverterNullable<>).MakeGenericType(valueTypeToConvert),
+                typeof(NullableConverter<>).MakeGenericType(valueTypeToConvert),
                 BindingFlags.Instance | BindingFlags.Public,
                 binder: null,
                 args: new object[] { valueConverter },
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
index 27a361ebae7824..acbae39e3edc36 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/ObjectConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterObject : JsonConverter<object>
+    internal sealed class ObjectConverter : JsonConverter<object>
     {
         public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs
index 239dbbd44f83d5..bbc004a29c07a9 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SByteConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterSByte : JsonConverter<sbyte>
+    internal sealed class SByteConverter : JsonConverter<sbyte>
     {
         public override sbyte Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs
index ba5a3a16965753..c7c8b180ff5a87 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/SingleConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterSingle : JsonConverter<float>
+    internal sealed class SingleConverter : JsonConverter<float>
     {
         public override float Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs
index 598b059c8a2b0e..bd420a35e719c0 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/StringConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterString : JsonConverter<string?>
+    internal sealed class StringConverter : JsonConverter<string?>
     {
         public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs
index 4939aff78b288c..56f24b06a5345b 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt16Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterUInt16 : JsonConverter<ushort>
+    internal sealed class UInt16Converter : JsonConverter<ushort>
     {
         public override ushort Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs
index c9edf4f77889f5..9dfc006ac6836a 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt32Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterUInt32 : JsonConverter<uint>
+    internal sealed class UInt32Converter : JsonConverter<uint>
     {
         public override uint Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs
index 4bb14140987e44..af26a458c86c9b 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UInt64Converter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterUInt64 : JsonConverter<ulong>
+    internal sealed class UInt64Converter : JsonConverter<ulong>
     {
         public override ulong Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs
index 0a8215210640bf..bf77a0209e1b55 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Value/UriConverter.cs
@@ -4,7 +4,7 @@
 
 namespace System.Text.Json.Serialization.Converters
 {
-    internal sealed class JsonConverterUri : JsonConverter<Uri>
+    internal sealed class UriConverter : JsonConverter<Uri>
     {
         public override Uri Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs
index 67acf6a887e4d0..788c3ae3317bfe 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Buffers;
 using System.Diagnostics;
 using System.Reflection;
 
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
index 227a5b8c835c9d..b449400d9c319c 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
@@ -4,6 +4,7 @@
 
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text.Json.Serialization;
@@ -48,16 +49,16 @@ private static List<JsonConverter> GetDefaultConverters()
             var converters = new List<JsonConverter>(NumberOfConverters);
 
             // Nullable converter should always be first since it forwards to any nullable type.
-            converters.Add(new JsonValueConverterNullableFactory());
+            converters.Add(new NullableConverterFactory());
 
-            converters.Add(new JsonConverterEnum());
-            converters.Add(new JsonKeyValuePairConverter());
+            converters.Add(new EnumConverterFactory());
+            converters.Add(new KeyValuePairConverterFactory());
 
             // IEnumerable should always be last since they can convert any IEnumerable.
             converters.Add(new JsonIEnumerableConverterFactory());
 
             // Object should always be last since it converts any type.
-            converters.Add(new JsonObjectConverterFactory());
+            converters.Add(new ObjectConverterFactory());
 
             Debug.Assert(NumberOfConverters == converters.Count);
 
@@ -259,27 +260,27 @@ private static IEnumerable<JsonConverter> DefaultSimpleConverters
             {
                 // When adding to this, update NumberOfSimpleConverters above.
 
-                yield return new JsonConverterBoolean();
-                yield return new JsonConverterByte();
-                yield return new JsonConverterByteArray();
-                yield return new JsonConverterChar();
-                yield return new JsonConverterDateTime();
-                yield return new JsonConverterDateTimeOffset();
-                yield return new JsonConverterDouble();
-                yield return new JsonConverterDecimal();
-                yield return new JsonConverterGuid();
-                yield return new JsonConverterInt16();
-                yield return new JsonConverterInt32();
-                yield return new JsonConverterInt64();
-                yield return new JsonConverterJsonElement();
-                yield return new JsonConverterObject();
-                yield return new JsonConverterSByte();
-                yield return new JsonConverterSingle();
-                yield return new JsonConverterString();
-                yield return new JsonConverterUInt16();
-                yield return new JsonConverterUInt32();
-                yield return new JsonConverterUInt64();
-                yield return new JsonConverterUri();
+                yield return new BooleanConverter();
+                yield return new ByteConverter();
+                yield return new ByteArrayConverter();
+                yield return new CharConverter();
+                yield return new DateTimeConverter();
+                yield return new DateTimeOffsetConverter();
+                yield return new DoubleConverter();
+                yield return new DecimalConverter();
+                yield return new GuidConverter();
+                yield return new Int16Converter();
+                yield return new Int32Converter();
+                yield return new Int64Converter();
+                yield return new JsonElementConverter();
+                yield return new ObjectConverter();
+                yield return new SByteConverter();
+                yield return new SingleConverter();
+                yield return new StringConverter();
+                yield return new UInt16Converter();
+                yield return new UInt32Converter();
+                yield return new UInt64Converter();
+                yield return new UriConverter();
             }
         }
     }
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
index 056432c0259cd2..ca363da7be16bf 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonStringEnumConverter.cs
@@ -56,11 +56,11 @@ public override bool CanConvert(Type typeToConvert)
         /// <inheritdoc />
         [PreserveDependency(
             ".ctor(System.Text.Json.Serialization.Converters.EnumConverterOptions, System.Text.Json.JsonNamingPolicy)",
-            "System.Text.Json.Serialization.Converters.JsonConverterEnum`1")]
+            "System.Text.Json.Serialization.Converters.EnumConverter`1")]
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             JsonConverter converter = (JsonConverter)Activator.CreateInstance(
-                typeof(JsonConverterEnum<>).MakeGenericType(typeToConvert),
+                typeof(EnumConverter<>).MakeGenericType(typeToConvert),
                 BindingFlags.Instance | BindingFlags.Public,
                 binder: null,
                 new object?[] { _converterOptions, _namingPolicy },
diff --git a/src/libraries/System.Text.Json/tests/Serialization/OptionsTests.cs b/src/libraries/System.Text.Json/tests/Serialization/OptionsTests.cs
index 10926b15ce1283..44fd8f7ac8a57b 100644
--- a/src/libraries/System.Text.Json/tests/Serialization/OptionsTests.cs
+++ b/src/libraries/System.Text.Json/tests/Serialization/OptionsTests.cs
@@ -326,9 +326,9 @@ public static void JsonEncodedTextStringsCustomAllowAll(string message, string e
         [Fact]
         public static void Options_GetConverterForObjectJsonElement_GivesCorrectConverter()
         {
-            GenericObjectOrJsonElementConverterTestHelper<object>("JsonConverterObject", new object(), "[3]", true);
+            GenericObjectOrJsonElementConverterTestHelper<object>("ObjectConverter", new object(), "[3]", true);
             JsonElement element = JsonDocument.Parse("[3]").RootElement;
-            GenericObjectOrJsonElementConverterTestHelper<JsonElement>("JsonConverterJsonElement", element, "[3]", false);
+            GenericObjectOrJsonElementConverterTestHelper<JsonElement>("JsonElementConverter", element, "[3]", false);
         }
 
         private static void GenericObjectOrJsonElementConverterTestHelper<T>(string converterName, object objectValue, string stringValue, bool throws)
@@ -381,28 +381,28 @@ private static void GenericObjectOrJsonElementConverterTestHelper<T>(string conv
         public static void Options_GetConverter_GivesCorrectDefaultConverterAndReadWriteSuccess()
         {
             var options = new JsonSerializerOptions();
-            GenericConverterTestHelper<bool>("JsonConverterBoolean", true, "true", options);
-            GenericConverterTestHelper<byte>("JsonConverterByte", (byte)128, "128", options);
-            GenericConverterTestHelper<char>("JsonConverterChar", 'A', "\"A\"", options);
-            GenericConverterTestHelper<double>("JsonConverterDouble", 15.1d, "15.1", options);
-            GenericConverterTestHelper<SampleEnum>("JsonConverterEnum`1", SampleEnum.Two, "2", options);
-            GenericConverterTestHelper<short>("JsonConverterInt16", (short)5, "5", options);
-            GenericConverterTestHelper<int>("JsonConverterInt32", -100, "-100", options);
-            GenericConverterTestHelper<long>("JsonConverterInt64", (long)11111, "11111", options);
-            GenericConverterTestHelper<sbyte>("JsonConverterSByte", (sbyte)-121, "-121", options);
-            GenericConverterTestHelper<float>("JsonConverterSingle", 14.5f, "14.5", options);
-            GenericConverterTestHelper<string>("JsonConverterString", "Hello", "\"Hello\"", options);
-            GenericConverterTestHelper<ushort>("JsonConverterUInt16", (ushort)1206, "1206", options);
-            GenericConverterTestHelper<uint>("JsonConverterUInt32", (uint)3333, "3333", options);
-            GenericConverterTestHelper<ulong>("JsonConverterUInt64", (ulong)44444, "44444", options);
-            GenericConverterTestHelper<decimal>("JsonConverterDecimal", 3.3m, "3.3", options);
-            GenericConverterTestHelper<byte[]>("JsonConverterByteArray", new byte[] { 1, 2, 3, 4 }, "\"AQIDBA==\"", options);
-            GenericConverterTestHelper<DateTime>("JsonConverterDateTime", new DateTime(2018, 12, 3), "\"2018-12-03T00:00:00\"", options);
-            GenericConverterTestHelper<DateTimeOffset>("JsonConverterDateTimeOffset", new DateTimeOffset(new DateTime(2018, 12, 3, 00, 00, 00, DateTimeKind.Utc)), "\"2018-12-03T00:00:00+00:00\"", options);
+            GenericConverterTestHelper<bool>("BooleanConverter", true, "true", options);
+            GenericConverterTestHelper<byte>("ByteConverter", (byte)128, "128", options);
+            GenericConverterTestHelper<char>("CharConverter", 'A', "\"A\"", options);
+            GenericConverterTestHelper<double>("DoubleConverter", 15.1d, "15.1", options);
+            GenericConverterTestHelper<SampleEnum>("EnumConverter`1", SampleEnum.Two, "2", options);
+            GenericConverterTestHelper<short>("Int16Converter", (short)5, "5", options);
+            GenericConverterTestHelper<int>("Int32Converter", -100, "-100", options);
+            GenericConverterTestHelper<long>("Int64Converter", (long)11111, "11111", options);
+            GenericConverterTestHelper<sbyte>("SByteConverter", (sbyte)-121, "-121", options);
+            GenericConverterTestHelper<float>("SingleConverter", 14.5f, "14.5", options);
+            GenericConverterTestHelper<string>("StringConverter", "Hello", "\"Hello\"", options);
+            GenericConverterTestHelper<ushort>("UInt16Converter", (ushort)1206, "1206", options);
+            GenericConverterTestHelper<uint>("UInt32Converter", (uint)3333, "3333", options);
+            GenericConverterTestHelper<ulong>("UInt64Converter", (ulong)44444, "44444", options);
+            GenericConverterTestHelper<decimal>("DecimalConverter", 3.3m, "3.3", options);
+            GenericConverterTestHelper<byte[]>("ByteArrayConverter", new byte[] { 1, 2, 3, 4 }, "\"AQIDBA==\"", options);
+            GenericConverterTestHelper<DateTime>("DateTimeConverter", new DateTime(2018, 12, 3), "\"2018-12-03T00:00:00\"", options);
+            GenericConverterTestHelper<DateTimeOffset>("DateTimeOffsetConverter", new DateTimeOffset(new DateTime(2018, 12, 3, 00, 00, 00, DateTimeKind.Utc)), "\"2018-12-03T00:00:00+00:00\"", options);
             Guid testGuid = new Guid();
-            GenericConverterTestHelper<Guid>("JsonConverterGuid", testGuid, $"\"{testGuid.ToString()}\"", options);
-            GenericConverterTestHelper<KeyValuePair<string, string>>("JsonKeyValuePairConverter`2", new KeyValuePair<string, string>("key", "value"), @"{""Key"":""key"",""Value"":""value""}", options);
-            GenericConverterTestHelper<Uri>("JsonConverterUri", new Uri("http://test.com"), "\"http://test.com\"", options);
+            GenericConverterTestHelper<Guid>("GuidConverter", testGuid, $"\"{testGuid.ToString()}\"", options);
+            GenericConverterTestHelper<KeyValuePair<string, string>>("KeyValuePairConverter`2", new KeyValuePair<string, string>("key", "value"), @"{""Key"":""key"",""Value"":""value""}", options);
+            GenericConverterTestHelper<Uri>("UriConverter", new Uri("http://test.com"), "\"http://test.com\"", options);
             
         }
 

From 640e3a77f8df900f006c077e46b8f316227ab09a Mon Sep 17 00:00:00 2001
From: Steve Harter <steveharter@users.noreply.github.com>
Date: Wed, 12 Feb 2020 11:33:07 -0600
Subject: [PATCH 3/3] Additional renaming and csproj changes

---
 .../src/System.Text.Json.csproj               | 34 ++++++++++---------
 .../Collection/DictionaryDefaultConverter.cs  |  2 +-
 .../DictionaryOfStringTValueConverter.cs      |  2 +-
 .../Collection/IDictionaryConverter.cs        |  2 +-
 .../IDictionaryOfStringTValueConverter.cs     |  2 +-
 .../IEnumerableConverterFactoryHelpers.cs}    |  2 +-
 ...adOnlyDictionaryOfStringTValueConverter.cs |  2 +-
 ...utableDictionaryOfStringTValueConverter.cs |  2 +-
 .../JsonSerializerOptions.Converters.cs       |  1 -
 9 files changed, 25 insertions(+), 24 deletions(-)
 rename src/libraries/System.Text.Json/src/System/Text/Json/Serialization/{ExtensionMethods.cs => Converters/Collection/IEnumerableConverterFactoryHelpers.cs} (99%)

diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
index 3ac099ac3574a3..66f909300bd4e4 100644
--- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj
+++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj
@@ -43,21 +43,6 @@
     <Compile Include="System\Text\Json\JsonHelpers.cs" />
     <Compile Include="System\Text\Json\JsonHelpers.Date.cs" />
     <Compile Include="System\Text\Json\JsonTokenType.cs" />
-    <Compile Include="System\Text\Json\Node\DuplicatePropertyNameHandlingStrategy.cs" />
-    <Compile Include="System\Text\Json\Node\JsonArray.cs" />
-    <Compile Include="System\Text\Json\Node\JsonArrayEnumerator.cs" />
-    <Compile Include="System\Text\Json\Node\JsonBoolean.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.RecursionStackFrame.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.Traversal.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNode.TraversalHelpers.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNodeOptions.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNull.cs" />
-    <Compile Include="System\Text\Json\Node\JsonNumber.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObject.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObjectEnumerator.cs" />
-    <Compile Include="System\Text\Json\Node\JsonObjectProperty.cs" />
-    <Compile Include="System\Text\Json\Node\JsonString.cs" />
     <Compile Include="System\Text\Json\Reader\ConsumeNumberResult.cs" />
     <Compile Include="System\Text\Json\Reader\ConsumeTokenResult.cs" />
     <Compile Include="System\Text\Json\Reader\JsonReaderException.cs" />
@@ -80,6 +65,7 @@
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IDictionaryOfStringTValueConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableConverterFactory.cs" />
+    <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableConverterFactoryHelpers.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableDefaultConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableOfTConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Collection\IEnumerableWithAddMethodConverter.cs" />
@@ -123,7 +109,6 @@
     <Compile Include="System\Text\Json\Serialization\Converters\Value\UInt64Converter.cs" />
     <Compile Include="System\Text\Json\Serialization\Converters\Value\UriConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\DefaultReferenceResolver.cs" />
-    <Compile Include="System\Text\Json\Serialization\ExtensionMethods.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonAttribute.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonCamelCaseNamingPolicy.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonClassInfo.AddProperty.cs" />
@@ -214,6 +199,23 @@
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.String.cs" />
     <Compile Include="System\Text\Json\Writer\Utf8JsonWriter.WriteValues.UnsignedNumber.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="System\Text\Json\Node\DuplicatePropertyNameHandlingStrategy.cs" />
+    <Compile Include="System\Text\Json\Node\JsonArray.cs" />
+    <Compile Include="System\Text\Json\Node\JsonArrayEnumerator.cs" />
+    <Compile Include="System\Text\Json\Node\JsonBoolean.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.RecursionStackFrame.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.Traversal.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNode.TraversalHelpers.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNodeOptions.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNull.cs" />
+    <Compile Include="System\Text\Json\Node\JsonNumber.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObject.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObjectEnumerator.cs" />
+    <Compile Include="System\Text\Json\Node\JsonObjectProperty.cs" />
+    <Compile Include="System\Text\Json\Node\JsonString.cs" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true' or '$(TargetsNetFx)' == 'true'">
     <Compile Include="System\Collections\Generic\StackExtensions.netstandard.cs" />
     <!-- Common or Common-branched source files -->
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
index 62f64bfc8be1ad..863347b10bc2d7 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryDefaultConverter.cs
@@ -9,7 +9,7 @@ namespace System.Text.Json.Serialization.Converters
     /// <summary>
     /// Default base class implementation of <cref>JsonDictionaryConverter{TCollection}</cref> .
     /// </summary>
-    internal abstract class JsonDictionaryDefaultConverter<TCollection, TValue>
+    internal abstract class DictionaryDefaultConverter<TCollection, TValue>
         : JsonDictionaryConverter<TCollection>
     {
         /// <summary>
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
index 7e501d0c74310c..c4685eb74ab5d5 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/DictionaryOfStringTValueConverter.cs
@@ -12,7 +12,7 @@ namespace System.Text.Json.Serialization.Converters
     /// representing the dictionary element key and value.
     /// </summary>
     internal sealed class DictionaryOfStringTValueConverter<TCollection, TValue>
-        : JsonDictionaryDefaultConverter<TCollection, TValue>
+        : DictionaryDefaultConverter<TCollection, TValue>
         where TCollection : Dictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
index e4182a2907a719..5702bd2da362a7 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryConverter.cs
@@ -13,7 +13,7 @@ namespace System.Text.Json.Serialization.Converters
     /// representing the dictionary element key and value.
     /// </summary>
     internal sealed class IDictionaryConverter<TCollection>
-        : JsonDictionaryDefaultConverter<TCollection, object?>
+        : DictionaryDefaultConverter<TCollection, object?>
         where TCollection : IDictionary
     {
         protected override void Add(object? value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
index 8798375460436f..fd912fa799b1d9 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IDictionaryOfStringTValueConverter.cs
@@ -12,7 +12,7 @@ namespace System.Text.Json.Serialization.Converters
     /// (de)serializes as a JSON object with properties representing the dictionary element key and value.
     /// </summary>
     internal sealed class IDictionaryOfStringTValueConverter<TCollection, TValue>
-        : JsonDictionaryDefaultConverter<TCollection, TValue>
+        : DictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IDictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactoryHelpers.cs
similarity index 99%
rename from src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs
rename to src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactoryHelpers.cs
index 788c3ae3317bfe..4bd548f9a747c2 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/ExtensionMethods.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IEnumerableConverterFactoryHelpers.cs
@@ -7,7 +7,7 @@
 
 namespace System.Text.Json.Serialization
 {
-    internal static class ExtensionMethods
+    internal static class IEnumerableConverterFactoryHelpers
     {
         private const string ImmutableArrayTypeName = "System.Collections.Immutable.ImmutableArray";
         private const string ImmutableArrayGenericTypeName = "System.Collections.Immutable.ImmutableArray`1";
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
index 36065f28d2ef00..74b70802ea022c 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/IReadOnlyDictionaryOfStringTValueConverter.cs
@@ -8,7 +8,7 @@
 namespace System.Text.Json.Serialization.Converters
 {
     internal sealed class IReadOnlyDictionaryOfStringTValueConverter<TCollection, TValue>
-        : JsonDictionaryDefaultConverter<TCollection, TValue>
+        : DictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IReadOnlyDictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
index a2cc29a690e8d1..145b304eb2b5bc 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/Converters/Collection/ImmutableDictionaryOfStringTValueConverter.cs
@@ -8,7 +8,7 @@
 namespace System.Text.Json.Serialization.Converters
 {
     internal sealed class ImmutableDictionaryOfStringTValueConverter<TCollection, TValue>
-        : JsonDictionaryDefaultConverter<TCollection, TValue>
+        : DictionaryDefaultConverter<TCollection, TValue>
         where TCollection : IReadOnlyDictionary<string, TValue>
     {
         protected override void Add(TValue value, JsonSerializerOptions options, ref ReadStack state)
diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
index b449400d9c319c..c17282b56eabee 100644
--- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
+++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonSerializerOptions.Converters.cs
@@ -4,7 +4,6 @@
 
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics;
 using System.Reflection;
 using System.Text.Json.Serialization;