diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2a7b539b..c71337a6 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # Global rule:
-* @Bandwidth/band-swi @Bandwidth/band-swi-github-repo-admin
+* @Bandwidth/band-swi @Bandwidth/band-swi-github-repo-admin @Bandwidth/band-programmable-voice-swi
diff --git a/README.md b/README.md
index 86061ad4..97bbb299 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# bandwidth-sdk
+# bandwidth_sdk
 Bandwidth's Communication APIs
 
 This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
diff --git a/custom_templates/setup.mustache b/custom_templates/setup.mustache
index 9299b1e5..e3a76a78 100644
--- a/custom_templates/setup.mustache
+++ b/custom_templates/setup.mustache
@@ -6,7 +6,7 @@ import os
 import sys
 from setuptools import setup, find_packages  # noqa: H301
 
-NAME = "bandwidth-sdk"
+NAME = "{{{projectName}}}"
 VERSION = os.environ['RELEASE_VERSION']
 
 with open('README.md', 'r', encoding='utf-8') as fh:
diff --git a/openapi-config.yml b/openapi-config.yml
index c8cebd92..b3ebef05 100644
--- a/openapi-config.yml
+++ b/openapi-config.yml
@@ -1,4 +1,4 @@
-projectName: bandwidth-sdk
+projectName: bandwidth_sdk
 packageName: bandwidth
 packageUrl: 'https://dev.bandwidth.com/sdks/python'
 disallowAdditionalPropertiesIfNotPresent: false
diff --git a/setup.py b/setup.py
index e76160f5..ed152559 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@
 import sys
 from setuptools import setup, find_packages  # noqa: H301
 
-NAME = "bandwidth-sdk"
+NAME = "bandwidth_sdk"
 VERSION = os.environ['RELEASE_VERSION']
 
 with open('README.md', 'r', encoding='utf-8') as fh: