diff --git a/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2OptionsPage.cs b/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2OptionsPage.cs
index e3de678..edc3a1f 100644
--- a/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2OptionsPage.cs
+++ b/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2OptionsPage.cs
@@ -7,7 +7,7 @@
 using JetBrains.IDE.UI.Extensions;
 using JetBrains.IDE.UI.Options;
 using JetBrains.Lifetimes;
-using JetBrains.ReSharper.UnitTestFramework;
+using JetBrains.ReSharper.UnitTestFramework.UI.Options;
 
 namespace ReSharperPlugin.TestLinker2.Options
 {
diff --git a/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2Settings.cs b/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2Settings.cs
index cac598f..53696e2 100644
--- a/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2Settings.cs
+++ b/src/dotnet/ReSharperPlugin.TestLinker2/Options/TestLinker2Settings.cs
@@ -1,5 +1,5 @@
 using JetBrains.Application.Settings;
-using JetBrains.ReSharper.UnitTestFramework;
+using JetBrains.ReSharper.UnitTestFramework.Settings;
 
 namespace ReSharperPlugin.TestLinker2.Options
 {
diff --git a/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTestInvalidator.cs b/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTestInvalidator.cs
index dc0ffee..f309d7d 100644
--- a/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTestInvalidator.cs
+++ b/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTestInvalidator.cs
@@ -2,7 +2,8 @@
 using System.Linq;
 using JetBrains.Lifetimes;
 using JetBrains.ReSharper.Psi;
-using JetBrains.ReSharper.UnitTestFramework;
+using JetBrains.ReSharper.UnitTestFramework.Execution;
+using JetBrains.ReSharper.UnitTestFramework.Features;
 using JetBrains.Util;
 using ReSharperPlugin.TestLinker2.Utils;
 
@@ -11,13 +12,13 @@ namespace ReSharperPlugin.TestLinker2.UnitTesting
 	[PsiComponent]
 	internal class LinkedTestInvalidator
 	{
-		private readonly IUnitTestElementStuff _unitTestElementStuff;
+		private readonly IUnitTestPsiManager _unitTestElementStuff;
 		private readonly IUnitTestResultManager _unitTestResultManager;
 
 		public LinkedTestInvalidator(
 			Lifetime lifetime,
 			ChangedTypesProvider changedTypesProvider,
-			IUnitTestElementStuff unitTestElementStuff,
+			IUnitTestPsiManager unitTestElementStuff,
 			IUnitTestResultManager unitTestResultManager)
 		{
 			_unitTestElementStuff = unitTestElementStuff;
diff --git a/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTypeUnitTestsDataRuleRegistrar.cs b/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTypeUnitTestsDataRuleRegistrar.cs
index 2542800..7727c58 100644
--- a/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTypeUnitTestsDataRuleRegistrar.cs
+++ b/src/dotnet/ReSharperPlugin.TestLinker2/UnitTesting/LinkedTypeUnitTestsDataRuleRegistrar.cs
@@ -2,9 +2,10 @@
 using JetBrains.Application.DataContext;
 using JetBrains.Lifetimes;
 using JetBrains.ProjectModel;
-using JetBrains.ReSharper.UnitTestFramework;
-using JetBrains.ReSharper.UnitTestFramework.Common;
+using JetBrains.ReSharper.UnitTestFramework.Actions;
 using JetBrains.ReSharper.UnitTestFramework.Criteria;
+using JetBrains.ReSharper.UnitTestFramework.Execution.Launch;
+using JetBrains.ReSharper.UnitTestFramework.Features;
 using JetBrains.Util;
 using ReSharperPlugin.TestLinker2.Utils;
 
@@ -13,18 +14,18 @@ namespace ReSharperPlugin.TestLinker2.UnitTesting
 	[SolutionComponent]
 	public class LinkedTypeUnitTestsDataRuleRegistrar
 	{
-		private readonly IUnitTestElementStuff _unitTestElementStuff;
+		private readonly IUnitTestPsiManager _unitTestElementStuff;
 
 		public LinkedTypeUnitTestsDataRuleRegistrar(
 			Lifetime lifetime,
 			DataContexts dataContexts,
-			IUnitTestElementStuff unitTestElementStuff)
+			IUnitTestPsiManager unitTestElementStuff)
 		{
 			_unitTestElementStuff = unitTestElementStuff;
 
 			var dataRule = new DataRule<UnitTestElements>.DesperateDataRule(
 				"ProjectModelToUnitTestElements",
-				UnitTestDataConstants.UnitTestElements.SELECTED,
+				UnitTestDataConstants.Elements.SELECTED,
 				LinkedTypeUnitTestsDataRule);
 
 			dataContexts.RegisterDataRule(lifetime, dataRule);
diff --git a/src/dotnet/ReSharperPlugin.TestLinker2/Utils/ModificationUtility.cs b/src/dotnet/ReSharperPlugin.TestLinker2/Utils/ModificationUtility.cs
index 47cdce3..7bba8b8 100644
--- a/src/dotnet/ReSharperPlugin.TestLinker2/Utils/ModificationUtility.cs
+++ b/src/dotnet/ReSharperPlugin.TestLinker2/Utils/ModificationUtility.cs
@@ -17,7 +17,8 @@
 using JetBrains.ReSharper.Psi.Tree;
 using JetBrains.ReSharper.Psi.Util;
 using JetBrains.ReSharper.Resources.Shell;
-using JetBrains.ReSharper.UnitTestFramework;
+using JetBrains.ReSharper.UnitTestFramework.Elements;
+using JetBrains.ReSharper.UnitTestFramework.Features;
 using JetBrains.TextControl;
 using JetBrains.Util;
 
@@ -52,7 +53,7 @@ public static void TryCreateTestOrProductionClass(ITypeElement sourceType, IText
 			var linkedTypeSourceFile = templateLinkedType.GetSingleOrDefaultSourceFile()
 				.NotNull("linkedTypeSourceFile != null");
 			var linkedTypeProject = linkedTypeSourceFile.GetProject().NotNull("linkedTypeProject != null");
-			var linkedTypeKind = !solution.GetComponent<IUnitTestElementStuff>()
+			var linkedTypeKind = !solution.GetComponent<IUnitTestPsiManager>()
 				.IsElementOfKind(templateLinkedType, UnitTestElementKind.TestContainer)
 				? TypeKind.Production
 				: TypeKind.Test;