diff --git a/babyblotter/templates/babyblotter/page.html b/babybuddy/templates/babybuddy/page.html
similarity index 83%
rename from babyblotter/templates/babyblotter/page.html
rename to babybuddy/templates/babybuddy/page.html
index 0b579211..e71222b2 100644
--- a/babyblotter/templates/babyblotter/page.html
+++ b/babybuddy/templates/babybuddy/page.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/nav-dropdown.html' %}
+{% extends 'babybuddy/nav-dropdown.html' %}
{% load static timers %}
{% block page %}
diff --git a/babyblotter/templates/babyblotter/paginator.html b/babybuddy/templates/babybuddy/paginator.html
similarity index 100%
rename from babyblotter/templates/babyblotter/paginator.html
rename to babybuddy/templates/babybuddy/paginator.html
diff --git a/babyblotter/templates/registration/base.html b/babybuddy/templates/registration/base.html
similarity index 87%
rename from babyblotter/templates/registration/base.html
rename to babybuddy/templates/registration/base.html
index dba51133..43e0952c 100644
--- a/babyblotter/templates/registration/base.html
+++ b/babybuddy/templates/registration/base.html
@@ -1,4 +1,4 @@
-{% extends "babyblotter/base.html" %}
+{% extends "babybuddy/base.html" %}
{% load static widget_tweaks %}
{% block breadcrumb_nav %}{% endblock %}
@@ -6,7 +6,7 @@
{% block page %}
-
Baby Blotter
+ Baby Buddy
{% block content %}{% endblock %}
diff --git a/babyblotter/templates/registration/login.html b/babybuddy/templates/registration/login.html
similarity index 100%
rename from babyblotter/templates/registration/login.html
rename to babybuddy/templates/registration/login.html
diff --git a/babyblotter/templates/registration/password_reset_complete.html b/babybuddy/templates/registration/password_reset_complete.html
similarity index 100%
rename from babyblotter/templates/registration/password_reset_complete.html
rename to babybuddy/templates/registration/password_reset_complete.html
diff --git a/babyblotter/templates/registration/password_reset_confirm.html b/babybuddy/templates/registration/password_reset_confirm.html
similarity index 100%
rename from babyblotter/templates/registration/password_reset_confirm.html
rename to babybuddy/templates/registration/password_reset_confirm.html
diff --git a/babyblotter/templates/registration/password_reset_done.html b/babybuddy/templates/registration/password_reset_done.html
similarity index 100%
rename from babyblotter/templates/registration/password_reset_done.html
rename to babybuddy/templates/registration/password_reset_done.html
diff --git a/babyblotter/templates/registration/password_reset_form.html b/babybuddy/templates/registration/password_reset_form.html
similarity index 100%
rename from babyblotter/templates/registration/password_reset_form.html
rename to babybuddy/templates/registration/password_reset_form.html
diff --git a/babyblotter/urls.py b/babybuddy/urls.py
similarity index 100%
rename from babyblotter/urls.py
rename to babybuddy/urls.py
diff --git a/babyblotter/wsgi.py b/babybuddy/wsgi.py
similarity index 58%
rename from babyblotter/wsgi.py
rename to babybuddy/wsgi.py
index 2891dd6b..f0ac98d5 100644
--- a/babyblotter/wsgi.py
+++ b/babybuddy/wsgi.py
@@ -2,6 +2,6 @@ import os
from django.core.wsgi import get_wsgi_application
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "babyblotter.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "babybuddy.settings")
application = get_wsgi_application()
diff --git a/core/static_src/js/timer.js b/core/static_src/js/timer.js
index b9609b3e..e0c98449 100644
--- a/core/static_src/js/timer.js
+++ b/core/static_src/js/timer.js
@@ -1,4 +1,4 @@
-/* Baby Blotter Timer
+/* Baby Buddy Timer
*
* Uses a supplied ID to run a timer. The element using the ID must have
* three children with the following classes:
@@ -6,7 +6,7 @@
* * timer-minutes
* * timer-hours
*/
-BabyBlotter.Timer = function ($) {
+BabyBuddy.Timer = function ($) {
var runIntervalId = null;
var timerElement = null;
diff --git a/core/templates/core/child_confirm_delete.html b/core/templates/core/child_confirm_delete.html
index 47f5baf7..734abee8 100644
--- a/core/templates/core/child_confirm_delete.html
+++ b/core/templates/core/child_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% block title %}Delete a Child{% endblock %}
diff --git a/core/templates/core/child_detail.html b/core/templates/core/child_detail.html
index acda5ac0..58e31585 100644
--- a/core/templates/core/child_detail.html
+++ b/core/templates/core/child_detail.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% block title %}{{ object }}{% endblock %}
diff --git a/core/templates/core/child_form.html b/core/templates/core/child_form.html
index 3f20b615..f7807f5e 100644
--- a/core/templates/core/child_form.html
+++ b/core/templates/core/child_form.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% block title %}
{% if object %}
@@ -24,7 +24,7 @@
{% else %}
Add a Child
{% endif %}
- {% include 'babyblotter/form.html' %}
+ {% include 'babybuddy/form.html' %}
{% endblock %}
{% block javascript %}
diff --git a/core/templates/core/child_list.html b/core/templates/core/child_list.html
index 3622097d..ba4cef97 100644
--- a/core/templates/core/child_list.html
+++ b/core/templates/core/child_list.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% block title %}Children{% endblock %}
@@ -51,7 +51,7 @@
- {% include 'babyblotter/paginator.html' %}
+ {% include 'babybuddy/paginator.html' %}
{% if perms.core.add_child %}
diff --git a/core/templates/core/diaperchange_confirm_delete.html b/core/templates/core/diaperchange_confirm_delete.html
index 78c18257..2e74f893 100644
--- a/core/templates/core/diaperchange_confirm_delete.html
+++ b/core/templates/core/diaperchange_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% block title %}Delete a Diaper Change{% endblock %}
diff --git a/core/templates/core/diaperchange_form.html b/core/templates/core/diaperchange_form.html
index d934550e..e9c85952 100644
--- a/core/templates/core/diaperchange_form.html
+++ b/core/templates/core/diaperchange_form.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% block title %}
{% if request.resolver_match.url_name == 'diaperchange-update' %}
@@ -23,7 +23,7 @@
{% else %}
Add a Diaper Change
{% endif %}
- {% include 'babyblotter/form.html' %}
+ {% include 'babybuddy/form.html' %}
{% endblock %}
{% block javascript %}
diff --git a/core/templates/core/diaperchange_list.html b/core/templates/core/diaperchange_list.html
index f39d9b39..9fc2113d 100644
--- a/core/templates/core/diaperchange_list.html
+++ b/core/templates/core/diaperchange_list.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% load bootstrap %}
@@ -56,7 +56,7 @@
- {% include 'babyblotter/paginator.html' %}
+ {% include 'babybuddy/paginator.html' %}
{% if perms.core.add_diaperchange %}
diff --git a/core/templates/core/feeding_confirm_delete.html b/core/templates/core/feeding_confirm_delete.html
index 84019a9a..3b8838c5 100644
--- a/core/templates/core/feeding_confirm_delete.html
+++ b/core/templates/core/feeding_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% block title %}Delete a Feeding{% endblock %}
diff --git a/core/templates/core/feeding_form.html b/core/templates/core/feeding_form.html
index 77f35c1c..95e82e7b 100644
--- a/core/templates/core/feeding_form.html
+++ b/core/templates/core/feeding_form.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% block title %}
{% if request.resolver_match.url_name == 'feeding-update' %}
@@ -23,7 +23,7 @@
{% else %}
Add a Feeding
{% endif %}
- {% include 'babyblotter/form.html' %}
+ {% include 'babybuddy/form.html' %}
{% endblock %}
{% block javascript %}
diff --git a/core/templates/core/feeding_list.html b/core/templates/core/feeding_list.html
index 5a7198fb..7a6ee3c3 100644
--- a/core/templates/core/feeding_list.html
+++ b/core/templates/core/feeding_list.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% load duration %}
@@ -62,7 +62,7 @@
- {% include 'babyblotter/paginator.html' %}
+ {% include 'babybuddy/paginator.html' %}
{% if perms.core.add_feeding %}
diff --git a/core/templates/core/note_confirm_delete.html b/core/templates/core/note_confirm_delete.html
index 16102c09..f3e075e5 100644
--- a/core/templates/core/note_confirm_delete.html
+++ b/core/templates/core/note_confirm_delete.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% load widget_tweaks %}
{% block title %}Delete a Note{% endblock %}
diff --git a/core/templates/core/note_form.html b/core/templates/core/note_form.html
index 6e89a020..997cde00 100644
--- a/core/templates/core/note_form.html
+++ b/core/templates/core/note_form.html
@@ -1,4 +1,4 @@
-{% extends 'babyblotter/page.html' %}
+{% extends 'babybuddy/page.html' %}
{% block title %}
{% if request.resolver_match.url_name == 'note-update' %}
@@ -23,5 +23,5 @@
{% else %}