diff --git a/HISTORY.rst b/HISTORY.rst
index 95dd0af45..07bb8d3a4 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,7 @@ Release History
 * `azdev test`: new parameter --mark
 * Update the way invoking pytest
 * `azdev perf benchmark`: refine output
+* Support PEP420 package
 
 0.1.24
 ++++++
diff --git a/azdev/config/cli.flake8 b/azdev/config/cli.flake8
index 2c402923c..c407d8e79 100644
--- a/azdev/config/cli.flake8
+++ b/azdev/config/cli.flake8
@@ -9,7 +9,7 @@ ignore =
     C901   # code flow is too complex, too many violations, to be removed in the future
     W504   # line break after binary operator effect on readability is subjective
 exclude = 
-    azure_bdist_wheel.py
+    azure_cli_bdist_wheel.py
     build
     tools
     scripts
diff --git a/azdev/operations/legal.py b/azdev/operations/legal.py
index 91cbcb3a5..7c0f2e6ae 100644
--- a/azdev/operations/legal.py
+++ b/azdev/operations/legal.py
@@ -54,7 +54,7 @@ def check_license_headers():
         for py_file in py_files:
             py_file = str(py_file)
 
-            if py_file.endswith('azure_bdist_wheel.py'):
+            if py_file.endswith('azure_cli_bdist_wheel.py'):
                 continue
 
             for ignore_token in _IGNORE_SUBDIRS:
diff --git a/azdev/operations/setup.py b/azdev/operations/setup.py
index 17b5b34df..87aa4968e 100644
--- a/azdev/operations/setup.py
+++ b/azdev/operations/setup.py
@@ -86,10 +86,6 @@ def _install_cli(cli_path, deps=None):
     if deps == 'setup.py':
         # Resolve dependencies from setup.py files.
         # command modules have dependency on azure-cli-core so install this first
-        pip_cmd(
-            "install -q -e {}/src/azure-cli-nspkg".format(cli_path),
-            "Installing `azure-cli-nspkg`..."
-        )
         pip_cmd(
             "install -q -e {}/src/azure-cli-telemetry".format(cli_path),
             "Installing `azure-cli-telemetry`..."
@@ -108,10 +104,6 @@ def _install_cli(cli_path, deps=None):
     else:
         # First install packages without dependencies,
         # then resolve dependencies from requirements.*.txt file.
-        pip_cmd(
-            "install -e {}/src/azure-cli-nspkg --no-deps".format(cli_path),
-            "Installing `azure-cli-nspkg`..."
-        )
         pip_cmd(
             "install -e {}/src/azure-cli-telemetry --no-deps".format(cli_path),
             "Installing `azure-cli-telemetry`..."
@@ -136,11 +128,6 @@ def _install_cli(cli_path, deps=None):
         pip_cmd("install -r {}/src/azure-cli/{}".format(cli_path, req_file),
                 "Installing `{}`...".format(req_file))
 
-    # Ensure that the site package's azure/__init__.py has the old style namespace
-    # package declaration by installing the old namespace package
-    pip_cmd("install -q -I azure-nspkg==1.0.0", "Installing `azure-nspkg`...")
-    pip_cmd("install -q -I azure-mgmt-nspkg==1.0.0", "Installing `azure-mgmt-nspkg`...")
-
 
 def _copy_config_files():
     from glob import glob