diff --git a/Directory.Build.props b/Directory.Build.props
index 17605e8fafde..0d457f787d5e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -382,9 +382,11 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- When IsShipping property is set, other IsShipping* properties take its value if they are not set.
-    This is why IsShippingPackage is only set for Private packages, as Experimental are covered with IsShipping -->
-    <IsShipping Condition="$(MSBuildProjectName.Contains('Experimental'))">false</IsShipping>
+    <!-- Experimental packages should not be stable -->
+    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Experimental'))">true</SuppressFinalPackageVersion>
+    <IsShippingAssembly Condition="$(MSBuildProjectName.Contains('Experimental'))">false</IsShippingAssembly>
+
+    <!-- We don't want Private packages to be shipped to NuGet.org -->
     <IsShippingPackage Condition="$(MSBuildProjectName.Contains('Private')) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage>
   </PropertyGroup>
 </Project>
diff --git a/pkg/Directory.Build.props b/pkg/Directory.Build.props
index 972590c539c4..84d827d5ed25 100644
--- a/pkg/Directory.Build.props
+++ b/pkg/Directory.Build.props
@@ -56,8 +56,8 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <!-- BlockStable on private packages by default -->
-    <BlockStable Condition="'$(BlockStable)' == '' and $(MSBuildProjectName.Contains('Private'))">true</BlockStable>
+    <!-- SuppressFinalPackageVersion on private packages by default -->
+    <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(MSBuildProjectName.Contains('Private'))">true</SuppressFinalPackageVersion>
   </PropertyGroup>
 
 </Project>
diff --git a/pkg/baseline/baseline.props b/pkg/baseline/baseline.props
index a496dfa4dc84..c95c1870f25b 100644
--- a/pkg/baseline/baseline.props
+++ b/pkg/baseline/baseline.props
@@ -11,7 +11,7 @@
     Below targets should moved to packaging.targets in BuildTools but keeping in corefx for convenience right now
   -->
 
-  <Target Name="BlockStable" Condition="'$(BlockStable)' == 'true'" AfterTargets="CalculatePackageVersion">
+  <Target Name="BlockStable" Condition="'$(SuppressFinalPackageVersion)' == 'true'" AfterTargets="CalculatePackageVersion">
     <!-- DO NOT ship this packages as stable -->
     <Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
   </Target>
@@ -20,7 +20,7 @@
   <Target Name="GetPackageIdentityIfStable"
           Returns="@(_StablePackageIdentity)">
 
-    <ItemGroup Condition="'$(BlockStable)' != 'true'">
+    <ItemGroup Condition="'$(SuppressFinalPackageVersion)' != 'true'">
       <_StablePackageIdentity Include="$(Id)">
         <Version>$(PackageVersion)</Version>
       </_StablePackageIdentity>
diff --git a/src/System.Numerics.Tensors/Directory.Build.props b/src/System.Numerics.Tensors/Directory.Build.props
index a886aa0fea2c..aacaa60c35fc 100644
--- a/src/System.Numerics.Tensors/Directory.Build.props
+++ b/src/System.Numerics.Tensors/Directory.Build.props
@@ -5,6 +5,7 @@
     <AssemblyVersion>0.2.0.0</AssemblyVersion>
     <StrongNameKeyId>Open</StrongNameKeyId>
     <!-- This is a preview package. Do not mark as stable. -->
-    <BlockStable>true</BlockStable>
+    <SuppressFinalPackageVersion>true</SuppressFinalPackageVersion>
+    <IsShippingAssembly>false</IsShippingAssembly>
   </PropertyGroup>
 </Project>
diff --git a/src/System.Numerics.Tensors/pkg/System.Numerics.Tensors.pkgproj b/src/System.Numerics.Tensors/pkg/System.Numerics.Tensors.pkgproj
index b4daebf0d793..2c6b5cb1908c 100644
--- a/src/System.Numerics.Tensors/pkg/System.Numerics.Tensors.pkgproj
+++ b/src/System.Numerics.Tensors/pkg/System.Numerics.Tensors.pkgproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <!-- we need to be supported on pre-nuget-3 platforms (Dev12, Dev11, etc) -->
     <MinClientVersion>2.8.6</MinClientVersion>
-    <IsShipping>false</IsShipping>
   </PropertyGroup>
   <ItemGroup>
     <!-- We don't include the reference project for two reasons:
diff --git a/src/System.Runtime.Intrinsics.Experimental/Directory.Build.props b/src/System.Runtime.Intrinsics.Experimental/Directory.Build.props
index 6ca7a37188f0..aa74bf5413dc 100644
--- a/src/System.Runtime.Intrinsics.Experimental/Directory.Build.props
+++ b/src/System.Runtime.Intrinsics.Experimental/Directory.Build.props
@@ -2,8 +2,6 @@
   <Import Project="..\Directory.Build.props" />
   <PropertyGroup>
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
-    <!-- DO NOT ship this as stable. It contains preview-only APIs that will be stable in a future version. -->
-    <BlockStable>true</BlockStable>
     <StrongNameKeyId>Open</StrongNameKeyId>
   </PropertyGroup>
 </Project>
diff --git a/src/System.Utf8String.Experimental/Directory.Build.props b/src/System.Utf8String.Experimental/Directory.Build.props
index 25e3ba27477f..ce26045e3a5f 100644
--- a/src/System.Utf8String.Experimental/Directory.Build.props
+++ b/src/System.Utf8String.Experimental/Directory.Build.props
@@ -5,7 +5,5 @@
     <AssemblyVersion>4.0.0.0</AssemblyVersion>
     <!-- System.Memory uses the Open key, so we will also. -->
     <StrongNameKeyId>Open</StrongNameKeyId>
-    <!-- This is a preview package. Do not ship as stable. -->
-    <BlockStable>true</BlockStable>
   </PropertyGroup>
 </Project>