diff --git a/cookiecutter.json b/cookiecutter.json
index f13796e7..caed4acd 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -3,8 +3,8 @@
   "project_name_verbose": "Sample App",
   "repo_name": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_')|replace('.', '_')|trim() }}",
   "author_name": "Ben Beecher",
-  "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@lightmatter.com",
   "org_name": "Lightmatter",
+  "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@{{ cookiecutter.org_name|lower }}.com",
   "description": "A short description of the project.",
   "domain_name": "example.com",
   "version": "0.1.0",
diff --git a/{{cookiecutter.repo_name}}/scripts/setup_github.sh b/{{cookiecutter.repo_name}}/scripts/setup_github.sh
index 1d6d2d72..4e2be4c2 100755
--- a/{{cookiecutter.repo_name}}/scripts/setup_github.sh
+++ b/{{cookiecutter.repo_name}}/scripts/setup_github.sh
@@ -6,6 +6,6 @@ if [ -d .git ]; then
 else
     echo "Setting up Git"
     git init . -b main
-    git remote add origin "git@github.com:Lightmatter/{{ cookiecutter.repo_name }}.git"
+    git remote add origin "git@github.com:{{ cookiecutter.org_name }}/{{ cookiecutter.repo_name }}.git"
     #todo - add all and make initial push
 fi
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/footer.jinja b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/footer.jinja
index fcbd29e3..a8f2ddf2 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/footer.jinja
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/footer.jinja
@@ -44,7 +44,7 @@
             </a>
         </div>
         <p class="mt-8 text-center text-base text-gray-400">
-            &copy; {{ now().strftime("%Y") }} Lightmatter, Inc. All rights reserved.
+            &copy; {{ now().strftime("%Y") }} {{ cookiecutter.org_name }} All rights reserved.
         </p>
     </div>
 </footer>
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/index.jinja b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/index.jinja
index e580a7a4..b3adeefd 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/index.jinja
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/templates/index.jinja
@@ -1,7 +1,7 @@
 {% extends "base.jinja" %}
 {% from "components/button.jinja" import button %}
 {% block title %}
-    Index
+    {{ cookiecutter.org_name }} Base Install
 {% endblock title %}
 {% block content %}
   <div class="container mx-auto">
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/baker_recipes.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/baker_recipes.py
index a42acf13..47be89bb 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/baker_recipes.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/user/baker_recipes.py
@@ -2,7 +2,7 @@
 
 from .models import User
 
-email_seq = seq("test@lightmatter.com")
+email_seq = seq("test@{{ cookiecutter.org_name|lower }}.com")
 
 user = Recipe(
     User,
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/util/tests.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/util/tests.py
index 1fc3b514..900b3047 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/util/tests.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}/util/tests.py
@@ -34,11 +34,16 @@ def test_file_upload():
 
 
 def test_send_email(mailoutbox):
-    mail.send_mail("subject", "body", "from@lightmatter.com", ["to@lightmatter.com"])
+    mail.send_mail(
+        "subject",
+        "body",
+        "from@{{ cookiecutter.org_name|lower }}.com",
+        ["to@{{ cookiecutter.org_name|lower }}.com"],
+    )
     assert len(mailoutbox) == 1
 
     m = mailoutbox[0]
     assert m.subject == "subject"
     assert m.body == "body"
-    assert m.from_email == "from@lightmatter.com"
-    assert list(m.to) == ["to@lightmatter.com"]
+    assert m.from_email == "from@{{ cookiecutter.org_name|lower }}.com"
+    assert list(m.to) == ["to@{{ cookiecutter.org_name|lower }}.com"]