diff --git a/Directory.Build.props b/Directory.Build.props
index 418cb80..89b0900 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,24 +4,24 @@
     <ThisRoot>Zyborg.CommandLine.ModelBinder</ThisRoot>
     <ThisRepo>https://github.com/zyborg/$(ThisRoot)</ThisRepo>
     <ThisYear>$([System.DateTime]::Now.ToString("yyyy"))</ThisYear>
-  <PropertyGroup>
-
   </PropertyGroup>
+
+  <PropertyGroup>
     <Copyright>Copyright (C) $(ThisYear) Eugene Bekker.</Copyright>
     <RepositoryUrl>$(ThisRepo)</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Authors>https://github.com/zyborg/$(ThisRoot)/graphs/contributors</Authors>
-  <PropertyGroup>
-
   </PropertyGroup>
+
+  <PropertyGroup>
     <!-- deprecated:  https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets -->
     <!--
     <PackageLicenseUrl>https://github.com/zyborg/Zyborg.CommandLine.ModelBinder/blob/master/LICENSE</PackageLicenseUrl>
     -->
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  <PropertyGroup>
-
   </PropertyGroup>
+
+  <PropertyGroup>
     <!-- deprecated:  https://docs.microsoft.com/en-us/nuget/reference/msbuild-targets#packageiconurl -->
     <!--
     <PackageIconUrl>https://avatars2.githubusercontent.com/u/22501173?s=88&amp;v=4</PackageIconUrl>
diff --git a/src/Zyborg.CommandLine.ModelBinder/Zyborg.CommandLine.ModelBinder.csproj b/src/Zyborg.CommandLine.ModelBinder/Zyborg.CommandLine.ModelBinder.csproj
index ac24e2b..90967f3 100644
--- a/src/Zyborg.CommandLine.ModelBinder/Zyborg.CommandLine.ModelBinder.csproj
+++ b/src/Zyborg.CommandLine.ModelBinder/Zyborg.CommandLine.ModelBinder.csproj
@@ -14,11 +14,9 @@
    -->
   <PropertyGroup>
     <!-- Some properties are inherited from repo-wide settings -->
-    <PackageId>Zyborg.CommandLine.ModelBinder</PackageId>
+    <PackageId>$(ThisRoot)</PackageId>
     <Description>A declarative approach for CLI parsing atop System.CommandLine</Description>
-    <PackageLicenseUrl>https://github.com/zyborg/Zyborg.CommandLine.ModelBinder/blob/master/LICENSE</PackageLicenseUrl>
-    <PackageProjectUrl>https://github.com/zyborg/Zyborg.CommandLine.ModelBinder/tree/master/src/Zyborg.CommandLine.ModelBinder</PackageProjectUrl>
-    <PackageIconUrl>https://avatars2.githubusercontent.com/u/22501173?s=88&amp;v=4</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/zyborg/$(ThisRoot)/tree/master/src/$(ThisRoot)</PackageProjectUrl>
     <PackageTags>cli</PackageTags>
   </PropertyGroup>