diff --git a/sstreasury/jinja2/sstreasury/claim_edit.html b/sstreasury/jinja2/sstreasury/claim_edit.html
index 098492a..1d80d3d 100644
--- a/sstreasury/jinja2/sstreasury/claim_edit.html
+++ b/sstreasury/jinja2/sstreasury/claim_edit.html
@@ -48,7 +48,7 @@
 			<input class="eleven wide column" type="text" name="budget_id" value="{{ claim.budget_id }}">
 		</div>
 		<div class="ui required inline grid field">
-			<label class="three wide column">Claimee</label>
+			<label class="three wide column">Submitter</label>
 			<div class="eleven wide column">
 				<div class="ui list">
 					<div class="item">
diff --git a/sstreasury/jinja2/sstreasury/claim_print.html b/sstreasury/jinja2/sstreasury/claim_print.html
index 2d6866d..486e4bc 100644
--- a/sstreasury/jinja2/sstreasury/claim_print.html
+++ b/sstreasury/jinja2/sstreasury/claim_print.html
@@ -40,7 +40,7 @@
 				<td>{{ claim.date }}</td>
 			</tr>
 			<tr>
-				<td>Claimee</td>
+				<td>Submitter</td>
 				<td>
 					<div class="ui list">
 						<div class="item">
diff --git a/sstreasury/jinja2/sstreasury/claim_view.html b/sstreasury/jinja2/sstreasury/claim_view.html
index 7750da8..3bd957b 100644
--- a/sstreasury/jinja2/sstreasury/claim_view.html
+++ b/sstreasury/jinja2/sstreasury/claim_view.html
@@ -68,7 +68,7 @@
 				<td>{{ claim.date }}</td>
 			</tr>
 			<tr>
-				<td>Claimee</td>
+				<td>Submitter</td>
 				<td>
 					<div class="ui list">
 						<div class="item">
diff --git a/sstreasury/jinja2/sstreasury/email/approved.md b/sstreasury/jinja2/sstreasury/email/budget_approved.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/approved.md
rename to sstreasury/jinja2/sstreasury/email/budget_approved.md
diff --git a/sstreasury/jinja2/sstreasury/email/commented.md b/sstreasury/jinja2/sstreasury/email/budget_commented.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/commented.md
rename to sstreasury/jinja2/sstreasury/email/budget_commented.md
diff --git a/sstreasury/jinja2/sstreasury/email/endorsed.md b/sstreasury/jinja2/sstreasury/email/budget_endorsed_drafter.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/endorsed.md
rename to sstreasury/jinja2/sstreasury/email/budget_endorsed_drafter.md
diff --git a/sstreasury/jinja2/sstreasury/email/endorsed_secretary.md b/sstreasury/jinja2/sstreasury/email/budget_endorsed_secretary.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/endorsed_secretary.md
rename to sstreasury/jinja2/sstreasury/email/budget_endorsed_secretary.md
diff --git a/sstreasury/jinja2/sstreasury/email/returned.md b/sstreasury/jinja2/sstreasury/email/budget_returned.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/returned.md
rename to sstreasury/jinja2/sstreasury/email/budget_returned.md
diff --git a/sstreasury/jinja2/sstreasury/email/returned_committee.md b/sstreasury/jinja2/sstreasury/email/budget_returned_committee.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/returned_committee.md
rename to sstreasury/jinja2/sstreasury/email/budget_returned_committee.md
diff --git a/sstreasury/jinja2/sstreasury/email/submitted_drafter.md b/sstreasury/jinja2/sstreasury/email/budget_submitted_drafter.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/submitted_drafter.md
rename to sstreasury/jinja2/sstreasury/email/budget_submitted_drafter.md
diff --git a/sstreasury/jinja2/sstreasury/email/submitted_treasurer.md b/sstreasury/jinja2/sstreasury/email/budget_submitted_treasurer.md
similarity index 100%
rename from sstreasury/jinja2/sstreasury/email/submitted_treasurer.md
rename to sstreasury/jinja2/sstreasury/email/budget_submitted_treasurer.md
diff --git a/sstreasury/views.py b/sstreasury/views.py
index 3ac00f9..f73b685 100644
--- a/sstreasury/views.py
+++ b/sstreasury/views.py
@@ -276,10 +276,10 @@ def budget_action(request, budget, revision):
 			emailer = Emailer()
 			for user in User.objects.filter(groups__name='Treasury'):
 				if user != request.user:
-					emailer.send_mail([user.email], 'New comment on budget: {}'.format(revision.name), 'sstreasury/email/commented.md', {'revision': revision, 'comment': comment})
+					emailer.send_mail([user.email], 'New comment on budget: {}'.format(revision.name), 'sstreasury/email/budget_commented.md', {'revision': revision, 'comment': comment})
 			for user in revision.contributors.all():
 				if user != request.user:
-					emailer.send_mail([user.email], 'New comment on budget: {}'.format(revision.name), 'sstreasury/email/commented.md', {'revision': revision, 'comment': comment})
+					emailer.send_mail([user.email], 'New comment on budget: {}'.format(revision.name), 'sstreasury/email/budget_commented.md', {'revision': revision, 'comment': comment})
 	
 	if 'Submit' in actions:
 		if not revision.can_submit(request.user):
@@ -290,9 +290,9 @@ def budget_action(request, budget, revision):
 			
 			emailer = Emailer()
 			for user in User.objects.filter(groups__name='Treasury'):
-				emailer.send_mail([user.email], 'Action required: Budget submitted: {}'.format(revision.name), 'sstreasury/email/submitted_treasurer.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Action required: Budget submitted: {}'.format(revision.name), 'sstreasury/email/budget_submitted_treasurer.md', {'revision': revision})
 			for user in revision.contributors.all():
-				emailer.send_mail([user.email], 'Budget submitted: {}'.format(revision.name), 'sstreasury/email/submitted_drafter.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Budget submitted: {}'.format(revision.name), 'sstreasury/email/budget_submitted_drafter.md', {'revision': revision})
 	
 	if 'Withdraw' in actions:
 		if not revision.can_withdraw(user):
@@ -310,9 +310,9 @@ def budget_action(request, budget, revision):
 			
 			emailer = Emailer()
 			for user in User.objects.filter(groups__name='Secretary'):
-				emailer.send_mail([user.email], 'Action required: Budget endorsed: {}'.format(revision.name), 'sstreasury/email/endorsed_secretary.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Action required: Budget endorsed: {}'.format(revision.name), 'sstreasury/email/budget_endorsed_secretary.md', {'revision': revision})
 			for user in revision.contributors.all():
-				emailer.send_mail([user.email], 'Budget endorsed, awaiting committee approval: {}'.format(revision.name), 'sstreasury/email/endorsed.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Budget endorsed, awaiting committee approval: {}'.format(revision.name), 'sstreasury/email/budget_endorsed_drafter.md', {'revision': revision})
 	
 	if 'Return' in actions:
 		if not revision.can_return(user):
@@ -323,7 +323,7 @@ def budget_action(request, budget, revision):
 			
 			emailer = Emailer()
 			for user in revision.contributors.all():
-				emailer.send_mail([user.email], 'Action required: Budget returned for re-drafting: {}'.format(revision.name), 'sstreasury/email/returned.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Action required: Budget returned for re-drafting: {}'.format(revision.name), 'sstreasury/email/budget_returned.md', {'revision': revision})
 	
 	if 'Approve' in actions:
 		if not revision.can_approve(user):
@@ -334,7 +334,7 @@ def budget_action(request, budget, revision):
 			
 			emailer = Emailer()
 			for user in revision.contributors.all():
-				emailer.send_mail([user.email], 'Budget approved: {}'.format(revision.name), 'sstreasury/email/approved.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Budget approved: {}'.format(revision.name), 'sstreasury/email/budget_approved.md', {'revision': revision})
 	
 	if 'CmteReturn' in actions:
 		if not revision.can_cmtereturn(user):
@@ -345,7 +345,7 @@ def budget_action(request, budget, revision):
 			
 			emailer = Emailer()
 			for user in revision.contributors.all():
-				emailer.send_mail([user.email], 'Action required: Budget returned for re-drafting: {}'.format(revision.name), 'sstreasury/email/returned_committee.md', {'revision': revision})
+				emailer.send_mail([user.email], 'Action required: Budget returned for re-drafting: {}'.format(revision.name), 'sstreasury/email/budget_returned_committee.md', {'revision': revision})
 	
 	return redirect(reverse('budget_view', kwargs={'id': budget.id}))