diff --git a/ckan/templates/package/activity.html b/ckan/templates/package/activity.html
index 52c0f8eade7..3941a6dda02 100644
--- a/ckan/templates/package/activity.html
+++ b/ckan/templates/package/activity.html
@@ -1,6 +1,6 @@
 {% extends "package/read_base.html" %}
 
-{% block subtitle %}{{ _('Activity Stream') }} - {{ c.pkg_dict.title or c.pkg_dict.name }}{% endblock %}
+{% block subtitle %}{{ _('Activity Stream') }} - {{ super() }}{% endblock %}
 
 {% block primary_content_inner %}
   <h1 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h1>
diff --git a/ckan/templates/package/activity_stream.html b/ckan/templates/package/activity_stream.html
deleted file mode 100644
index af67b063a7b..00000000000
--- a/ckan/templates/package/activity_stream.html
+++ /dev/null
@@ -1,10 +0,0 @@
-{% extends "package/read.html" %}
-
-{% block subtitle %}{{ _('Activity Stream') }}{% endblock %}
-
-{% block package_content %}
-  <h2 class="hide-heading">{% block page_heading %}{{ _('Activity Stream') }}{% endblock %}</h2>
-  {% block activity_stream %}
-    {{ c.package_activity_stream | safe }}
-  {% endblock %}
-{% endblock %}
diff --git a/ckan/templates/package/base.html b/ckan/templates/package/base.html
index b51f78faaa6..20dd0b1db27 100644
--- a/ckan/templates/package/base.html
+++ b/ckan/templates/package/base.html
@@ -4,6 +4,8 @@
 
 {% block breadcrumb_content_selected %} class="active"{% endblock %}
 
+{% block subtitle %}{{ _('Datasets') }}{% endblock %}
+
 {% block breadcrumb_content %}
   {% if pkg %}
     {% set dataset = pkg.title or pkg.name %}
diff --git a/ckan/templates/package/base_form_page.html b/ckan/templates/package/base_form_page.html
index 049d83b1ebb..5b8bd09fd60 100644
--- a/ckan/templates/package/base_form_page.html
+++ b/ckan/templates/package/base_form_page.html
@@ -1,4 +1,4 @@
-{% extends "package/base.html" %}
+{% extends "package/edit_base.html" %}
 
 {% block primary_content %}
   <section class="module">
diff --git a/ckan/templates/package/edit.html b/ckan/templates/package/edit.html
index 4f15985d033..ce6c7ad4fc2 100644
--- a/ckan/templates/package/edit.html
+++ b/ckan/templates/package/edit.html
@@ -4,6 +4,8 @@
 
 {% block breadcrumb_content_selected %}{% endblock %}
 
+{% block subtitle %}{{ _('Edit') }} - {{ super() }}{% endblock %}
+
 {% block breadcrumb_content %}
   {{ super() }}
   <li class="active">{% link_for _('Edit'), controller='package', action='edit', id=pkg.name %}</li>
diff --git a/ckan/templates/package/edit_base.html b/ckan/templates/package/edit_base.html
new file mode 100644
index 00000000000..e173c596425
--- /dev/null
+++ b/ckan/templates/package/edit_base.html
@@ -0,0 +1,5 @@
+{% extends "package/base.html" %}
+
+{% set pkg = c.pkg_dict %}
+
+{% block subtitle %}{{ pkg.title or pkg.name }} - {{ super() }}{% endblock %}
diff --git a/ckan/templates/package/new.html b/ckan/templates/package/new.html
index a3e7bae8e1c..a8eea92ca48 100644
--- a/ckan/templates/package/new.html
+++ b/ckan/templates/package/new.html
@@ -1,3 +1,3 @@
 {% extends "package/base_form_page.html" %}
 
-{% block subtitle %}{{ _('Create dataset') }}{% endblock %}
+{% block subtitle %}{{ _('Create Dataset') }}{% endblock %}
diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
index d70cc3e5bf2..9f178b198ec 100644
--- a/ckan/templates/package/read.html
+++ b/ckan/templates/package/read.html
@@ -2,8 +2,6 @@
 
 {% set pkg = c.pkg_dict %}
 
-{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
-
 {% block primary_content_inner %}
   {{ super() }}
   {% block package_description %}
diff --git a/ckan/templates/package/read_base.html b/ckan/templates/package/read_base.html
index 261c24499e2..d46c0384deb 100644
--- a/ckan/templates/package/read_base.html
+++ b/ckan/templates/package/read_base.html
@@ -1,6 +1,6 @@
 {% extends "package/base.html" %}
 
-{% block subtitle %}{{ pkg.title or pkg.name }}{% endblock %}
+{% block subtitle %}{{ pkg.title or pkg.name }} - {{ super() }}{% endblock %}
 
 {% block links -%}
   {{ super() }}
diff --git a/ckan/templates/package/related_list.html b/ckan/templates/package/related_list.html
index 0f31cb0e790..affdd974372 100644
--- a/ckan/templates/package/related_list.html
+++ b/ckan/templates/package/related_list.html
@@ -2,6 +2,8 @@
 
 {% set pkg = c.pkg %}
 
+{% block subtitle %}{{ _('Related') }} - {{ super() }}{% endblock %}
+
 {% block primary_content_inner %}
   <h2 class="hide-heading">{% block page_heading %}{{ _('Related Media for {dataset}').format(dataset=h.dataset_display_name(c.pkg)) }}{% endblock %}</h2>
   {% block related_list %}
diff --git a/ckan/templates/package/search.html b/ckan/templates/package/search.html
index 6274ecc0798..6c8173eb772 100644
--- a/ckan/templates/package/search.html
+++ b/ckan/templates/package/search.html
@@ -1,7 +1,7 @@
 {% extends "page.html" %}
 {% import 'macros/form.html' as form %}
 
-{% block subtitle %}{{ _("Search for a Dataset") }}{% endblock %}
+{% block subtitle %}{{ _("Datasets") }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li class="active">{{ h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index') }}</li>