diff --git a/Directory.Build.targets b/Directory.Build.targets
index b6a6cf5..b5c9432 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -9,9 +9,8 @@
 
   <Target Name="SetNuSpecProperties" BeforeTargets="GenerateNuspec" DependsOnTargets="GetBuildVersion">
     <PropertyGroup>
-      <PackageId>$(AssemblyName)</PackageId>
       <Authors>Eugene Tihonov</Authors>
-      <PackageDescription>A tool that can generate TypeScript or Flow types from C# classes</PackageDescription>
+      <PackageDescription>A tool that can generate TypeScript types from C# classes</PackageDescription>
       <PackageTags>TypeScript CodeGenerator</PackageTags>
       <RepositoryType>git</RepositoryType>
       <RepositoryUrl>https://github.com/skbkontur/TypeScript.ContractGenerator</RepositoryUrl>
diff --git a/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj b/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
index 1d84297..10878f0 100644
--- a/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
+++ b/TypeScript.ContractGenerator.Cli/TypeScript.ContractGenerator.Cli.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Cli</AssemblyName>
     <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Cli</RootNamespace>
+    <PackageId>SkbKontur.TypeScript.ContractGenerator.Cli</PackageId>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotnet-ts-gen</ToolCommandName>
   </PropertyGroup>
diff --git a/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj b/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
index 592b5ad..5a13654 100644
--- a/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
+++ b/TypeScript.ContractGenerator.Roslyn/TypeScript.ContractGenerator.Roslyn.csproj
@@ -4,6 +4,7 @@
       <TargetFramework>netstandard2.0</TargetFramework>
       <AssemblyName>SkbKontur.TypeScript.ContractGenerator.Roslyn</AssemblyName>
       <RootNamespace>SkbKontur.TypeScript.ContractGenerator.Roslyn</RootNamespace>
+      <PackageId>SkbKontur.TypeScript.ContractGenerator.Roslyn</PackageId>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/TypeScript.ContractGenerator/TypeScript.ContractGenerator.csproj b/TypeScript.ContractGenerator/TypeScript.ContractGenerator.csproj
index d478d20..68cb07d 100644
--- a/TypeScript.ContractGenerator/TypeScript.ContractGenerator.csproj
+++ b/TypeScript.ContractGenerator/TypeScript.ContractGenerator.csproj
@@ -4,6 +4,7 @@
       <TargetFramework>netstandard2.0</TargetFramework>
       <AssemblyName>SkbKontur.TypeScript.ContractGenerator</AssemblyName>
       <RootNamespace>SkbKontur.TypeScript.ContractGenerator</RootNamespace>
+      <PackageId>SkbKontur.TypeScript.ContractGenerator</PackageId>
       <LangVersion>8</LangVersion>
       <Nullable>enable</Nullable>
       <NoWarn>8618</NoWarn>