diff --git a/.gitignore b/.gitignore
index e575eca2..79bb506f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ coverage.xml
 *.cover
 .hypothesis/
 .pytest_cache/
+tests_cov_output/
 
 # Translations
 *.mo
@@ -97,6 +98,10 @@ venv/
 env/
 ENV/
 
+# pipenv
+Pipfile
+Pipfile.lock
+
 
 # Spyder project settings
 .spyderproject
diff --git a/agogosml/agogosml/__init__.py b/agogosml/agogosml/__init__.py
index 5d22958b..e856033b 100644
--- a/agogosml/agogosml/__init__.py
+++ b/agogosml/agogosml/__init__.py
@@ -1,7 +1,7 @@
 """Top-level package for Agogosml."""
 
-__author__ = """Rami Sayar"""
-__email__ = 'rami.sayar@microsoft.com'
+__author__ = """Microsoft Corporation"""
+__email__ = 'csenyc@microsoft.com'
 __version__ = '0.1.2'
 
 if __name__ == '__main__':
diff --git a/agogosml/docs/conf.py b/agogosml/docs/conf.py
index cd72f6c3..3f98fd27 100755
--- a/agogosml/docs/conf.py
+++ b/agogosml/docs/conf.py
@@ -48,8 +48,8 @@
 
 # General information about the project.
 project = u'Agogosml'
-copyright = u"2018, Rami Sayar"
-author = u"Rami Sayar"
+copyright = u"2018, Microsoft Corporation"
+author = u"Microsoft Corporation"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -130,7 +130,7 @@
 latex_documents = [
     (master_doc, 'agogosml.tex',
      u'Agogosml Documentation',
-     u'Rami Sayar', 'manual'),
+     u'Microsoft Corporation', 'manual'),
 ]
 
 
diff --git a/agogosml/setup.py b/agogosml/setup.py
index bb8cb7a6..1ca8fe9d 100644
--- a/agogosml/setup.py
+++ b/agogosml/setup.py
@@ -17,8 +17,8 @@
 test_requirements = ['pytest', ]
 
 setup(
-    author="Rami Sayar",
-    author_email='rami.sayar@microsoft.com',
+    author="Microsoft Corporation",
+    author_email='csenyc@microsoft.com',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
diff --git a/agogosml_cli/cli/__init__.py b/agogosml_cli/cli/__init__.py
index 0581906d..074acb15 100644
--- a/agogosml_cli/cli/__init__.py
+++ b/agogosml_cli/cli/__init__.py
@@ -1,7 +1,7 @@
 """Top-level package for agogosml_cli."""
 
-__author__ = """Rami Sayar"""
-__email__ = 'rami.sayar@microsoft.com'
+__author__ = """Microsoft Corporation"""
+__email__ = 'csenyc@microsoft.com'
 __version__ = '0.1.2'
 
 if __name__ == '__main__':
diff --git a/agogosml_cli/docs/conf.py b/agogosml_cli/docs/conf.py
index 37c6c445..cce0f334 100755
--- a/agogosml_cli/docs/conf.py
+++ b/agogosml_cli/docs/conf.py
@@ -49,7 +49,7 @@
 # General information about the project.
 project = u'Agogosml CLI'
 copyright = u"2018, Microsoft"
-author = u"Rami Sayar"
+author = u"Microsoft Corporation"
 
 # The version info for the project you're documenting, acts as replacement
 # for |version| and |release|, also used in various other places throughout
@@ -130,7 +130,7 @@
 latex_documents = [
     (master_doc, 'agogosml_cli.tex',
      u'Agogosml CLI Documentation',
-     u'Rami Sayar', 'manual'),
+     u'Microsoft Corporation', 'manual'),
 ]
 
 
diff --git a/agogosml_cli/setup.py b/agogosml_cli/setup.py
index 9d77966d..1875c81a 100644
--- a/agogosml_cli/setup.py
+++ b/agogosml_cli/setup.py
@@ -17,8 +17,8 @@
 test_requirements = ['pytest', ]
 
 setup(
-    author="Rami Sayar",
-    author_email='rami.sayar@microsoft.com',
+    author="Microsoft Corporation",
+    author_email='csenyc@microsoft.com',
     classifiers=[
         'Development Status :: 2 - Pre-Alpha',
         'Intended Audience :: Developers',
@@ -47,7 +47,7 @@
     setup_requires=setup_requirements,
     test_suite='tests',
     tests_require=test_requirements,
-    url='https://github.com/Microsoft/agogosml/agogosml_cli',
+    url='https://github.com/Microsoft/agogosml',
     version='0.1.2',
     zip_safe=False,
 )