diff --git a/opentech/public/funds/blocks.py b/opentech/public/funds/blocks.py
index 65dbea7652254222e793fef1e76ae27dfd9dac19..694ddc0a5ef9ea0b14268ce069e15989501b643c 100644
--- a/opentech/public/funds/blocks.py
+++ b/opentech/public/funds/blocks.py
@@ -7,14 +7,14 @@ class ProjectsBlock(StaticBlock):
     class Meta:
         icon = 'grip'
         label = 'List of Projects funded'
-        template = 'funds/blocks/related_projects.html'
+        template = 'public_funds/blocks/related_projects.html'
 
 
 class ReviewersBlock(StaticBlock):
     class Meta:
         icon = 'grip'
         label = 'List of fund Reviewers'
-        template = 'funds/blocks/related_reviewers.html'
+        template = 'public_funds/blocks/related_reviewers.html'
 
 
 class FundBlock(StoryBlock):
diff --git a/opentech/public/funds/templates/funds/blocks/related_projects.html b/opentech/public/funds/templates/funds/blocks/related_projects.html
deleted file mode 100644
index 692e68dbbe4d49dd6d91d729ce479f260b5ccd06..0000000000000000000000000000000000000000
--- a/opentech/public/funds/templates/funds/blocks/related_projects.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for project in page.projects %}
-    {% include "publicpages/includes/project_listing.html" with project=project %}
-{% endfor %}
diff --git a/opentech/public/funds/templates/public_funds/blocks/related_projects.html b/opentech/public/funds/templates/public_funds/blocks/related_projects.html
new file mode 100644
index 0000000000000000000000000000000000000000..a1a791e991778058d2f07ecebd60687b2ad1444d
--- /dev/null
+++ b/opentech/public/funds/templates/public_funds/blocks/related_projects.html
@@ -0,0 +1,3 @@
+{% for project in page.projects %}
+    {% include "public_funds/includes/project_listing.html" with project=project %}
+{% endfor %}
diff --git a/opentech/public/funds/templates/funds/blocks/related_reviewers.html b/opentech/public/funds/templates/public_funds/blocks/related_reviewers.html
similarity index 100%
rename from opentech/public/funds/templates/funds/blocks/related_reviewers.html
rename to opentech/public/funds/templates/public_funds/blocks/related_reviewers.html
diff --git a/opentech/public/funds/templates/funds/fund_index.html b/opentech/public/funds/templates/public_funds/fund_index.html
similarity index 100%
rename from opentech/public/funds/templates/funds/fund_index.html
rename to opentech/public/funds/templates/public_funds/fund_index.html
diff --git a/opentech/public/funds/templates/funds/fund_page.html b/opentech/public/funds/templates/public_funds/fund_page.html
similarity index 69%
rename from opentech/public/funds/templates/funds/fund_page.html
rename to opentech/public/funds/templates/public_funds/fund_page.html
index c0a5492da36e4588861ad6db146606ae6dc9be63..7c6f6f51608f36eee2a489ef095097807322574e 100644
--- a/opentech/public/funds/templates/funds/fund_page.html
+++ b/opentech/public/funds/templates/public_funds/fund_page.html
@@ -2,7 +2,7 @@
 {% load wagtailcore_tags wagtailimages_tags navigation_tags static %}
 
 {% block content %}
-    {% include "publicpages/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
+    {% include "public_funds/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
     <div class="wrapper wrapper--flex">
         <section class="section section--main">
             <h1>{{ page.title }}</h1>
@@ -11,6 +11,6 @@
             {% include_block page.body %}
         </section>
     </div>
-    {% include "publicpages/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
+    {% include "public_funds/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
     {% include "includes/relatedcontent.html" with related_pages=page.related_pages.all %}
 {% endblock %}
diff --git a/opentech/public/funds/templates/funds/includes/fund_apply_cta.html b/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
similarity index 100%
rename from opentech/public/funds/templates/funds/includes/fund_apply_cta.html
rename to opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
diff --git a/opentech/public/funds/templates/funds/includes/project_listing.html b/opentech/public/funds/templates/public_funds/includes/project_listing.html
similarity index 100%
rename from opentech/public/funds/templates/funds/includes/project_listing.html
rename to opentech/public/funds/templates/public_funds/includes/project_listing.html