diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index 4e0f23758..b6944af2f 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -30,7 +30,7 @@ steps:
   inputs:
     testAssemblyVer2: |
      **\*.Tests.dll
-     
+
     vsTestVersion: 16.0
     codeCoverageEnabled: true
 
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
index 4ab9ed7c3..7afeeebed 100644
--- a/.github/workflows/ci-cd.yml
+++ b/.github/workflows/ci-cd.yml
@@ -62,7 +62,7 @@ jobs:
           $projectsArray = @(
             '.\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj',
             '.\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj',
-            '.\src\Microsoft.OpenApi.Tool\Microsoft.OpenApi.Tool.csproj'
+            '.\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj'
           )
           $gitNewVersion = if ("${{ steps.tag_generator.outputs.new_version }}") {"${{ steps.tag_generator.outputs.new_version }}"} else {$null}
           $projectCurrentVersion = ([xml](Get-Content .\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj)).Project.PropertyGroup.Version
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 95c813772..999e48f53 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -33,7 +33,7 @@ jobs:
           $projectsArray = @(
             '.\src\Microsoft.OpenApi\Microsoft.OpenApi.csproj',
             '.\src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj',
-            '.\src\Microsoft.OpenApi.Tool\Microsoft.OpenApi.Tool.csproj'
+            '.\src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj'
           )
 
           $projectsArray | ForEach-Object {
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 0d20a9b46..c26bf0c9f 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Microsoft.OpenApi.Tool/bin/Debug/netcoreapp3.1/Microsoft.OpenApi.Tool.dll",
+            "program": "${workspaceFolder}/src/Microsoft.OpenApi.Hidi/bin/Debug/netcoreapp3.1/Microsoft.OpenApi.Hidi.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/src/Microsoft.OpenApi.Tool",
+            "cwd": "${workspaceFolder}/src/Microsoft.OpenApi.Hidi",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",
             "stopAtEntry": false
diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln
index e64ff3a24..dc489bff8 100644
--- a/Microsoft.OpenApi.sln
+++ b/Microsoft.OpenApi.sln
@@ -26,7 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.SmokeTests", "test\Microsoft.OpenApi.SmokeTests\Microsoft.OpenApi.SmokeTests.csproj", "{AD79B61D-88CF-497C-9ED5-41AE3867C5AC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Tool", "src\Microsoft.OpenApi.Tool\Microsoft.OpenApi.Tool.csproj", "{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Hidi", "src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj", "{254841B5-7DAC-4D1D-A9C5-44FE5CE467BE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/build.cmd b/build.cmd
index b3612c9ed..43cc95956 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,21 +1,21 @@
 @echo off
-Echo Building Microsoft.OpenApi 
+Echo Building Microsoft.OpenApi
 
-SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj 
+SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj
 dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
 dotnet msbuild %PROJ% /t:build /p:Configuration=Release
 dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
 Echo Building Microsoft.OpenApi.Readers
 
-SET PROJ=%~dp0src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj 
+SET PROJ=%~dp0src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj
 dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
 dotnet msbuild %PROJ% /t:build /p:Configuration=Release
 dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
-Echo Building Microsoft.OpenApi.Tool
+Echo Building Microsoft.OpenApi.Hidi
 
-SET PROJ=%~dp0src\Microsoft.OpenApi.Tool\Microsoft.OpenApi.Tool.csproj 
+SET PROJ=%~dp0src\Microsoft.OpenApi.Hidi\Microsoft.OpenApi.Hidi.csproj
 dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
 dotnet msbuild %PROJ% /t:build /p:Configuration=Release
 dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
diff --git a/install-tool.ps1 b/install-tool.ps1
index 0e6521110..0b4615c67 100644
--- a/install-tool.ps1
+++ b/install-tool.ps1
@@ -1,7 +1,7 @@
-$latest = Get-ChildItem .\artifacts\ Microsoft.OpenApi.Tool* | select-object -Last 1
+$latest = Get-ChildItem .\artifacts\Microsoft.OpenApi.Hidi* | select-object -Last 1
 $version = $latest.Name.Split(".")[3..5] | join-string -Separator "."
 
-if (Test-Path -Path ./artifacts/openapi-parser.exe) {
-  dotnet tool uninstall --tool-path artifacts Microsoft.OpenApi.Tool
+if (Test-Path -Path ./artifacts/hidi.exe) {
+  dotnet tool uninstall --tool-path artifacts Microsoft.OpenApi.Hidi
 }
-dotnet tool install --tool-path artifacts --add-source .\artifacts\ --version $version Microsoft.OpenApi.Tool
\ No newline at end of file
+dotnet tool install --tool-path artifacts --add-source .\artifacts\ --version $version Microsoft.OpenApi.Hidi
\ No newline at end of file
diff --git a/src/Microsoft.OpenApi.Tool/Microsoft.OpenApi.Tool.csproj b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
similarity index 88%
rename from src/Microsoft.OpenApi.Tool/Microsoft.OpenApi.Tool.csproj
rename to src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
index 40e46f1a4..f0d7943e7 100644
--- a/src/Microsoft.OpenApi.Tool/Microsoft.OpenApi.Tool.csproj
+++ b/src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj
@@ -4,9 +4,9 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackAsTool>true</PackAsTool>
-    <ToolCommandName>openapi-parser</ToolCommandName>
+    <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.3.0-preview</Version>
+    <Version>0.5.0-preview</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Microsoft.OpenApi.Tool/OpenApiService.cs b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
similarity index 99%
rename from src/Microsoft.OpenApi.Tool/OpenApiService.cs
rename to src/Microsoft.OpenApi.Hidi/OpenApiService.cs
index 1c993e0e8..486666568 100644
--- a/src/Microsoft.OpenApi.Tool/OpenApiService.cs
+++ b/src/Microsoft.OpenApi.Hidi/OpenApiService.cs
@@ -14,7 +14,7 @@
 using Microsoft.OpenApi.Validations;
 using Microsoft.OpenApi.Writers;
 
-namespace Microsoft.OpenApi.Tool
+namespace Microsoft.OpenApi.Hidi
 {
     static class OpenApiService
     {
diff --git a/src/Microsoft.OpenApi.Tool/Program.cs b/src/Microsoft.OpenApi.Hidi/Program.cs
similarity index 98%
rename from src/Microsoft.OpenApi.Tool/Program.cs
rename to src/Microsoft.OpenApi.Hidi/Program.cs
index a4d32c31e..533878a0d 100644
--- a/src/Microsoft.OpenApi.Tool/Program.cs
+++ b/src/Microsoft.OpenApi.Hidi/Program.cs
@@ -6,7 +6,7 @@
 using System.IO;
 using System.Threading.Tasks;
 
-namespace Microsoft.OpenApi.Tool
+namespace Microsoft.OpenApi.Hidi
 {
     static class Program
     {
diff --git a/src/Microsoft.OpenApi.Tool/StatsVisitor.cs b/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
similarity index 95%
rename from src/Microsoft.OpenApi.Tool/StatsVisitor.cs
rename to src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
index 3c633d860..b05b0de7c 100644
--- a/src/Microsoft.OpenApi.Tool/StatsVisitor.cs
+++ b/src/Microsoft.OpenApi.Hidi/StatsVisitor.cs
@@ -3,13 +3,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Services;
 
-namespace Microsoft.OpenApi.Tool
+namespace Microsoft.OpenApi.Hidi
 {
     internal class StatsVisitor : OpenApiVisitorBase
     {