8 files changed, 19 insertions, 19 deletions
diff --git a/templates/about/admin.html b/templates/about/admin.html
index e623b8f..e618d3e 100644
--- a/templates/about/admin.html
+++ b/templates/about/admin.html
@@ -3,6 +3,6 @@
     PyTasks - About - Admin
 {% endblock %}
 {% block content %}
-    Admin is the user who has to approve assign of credits to any user for his/her work on the task.<br />
+    Admin is the user who has to approve assign of pynts to any user for his/her work on the task.<br />
     An Admin also has the right to request normal users to become admins or managers or developers.
 {% endblock %}
diff --git a/templates/about/task.html b/templates/about/task.html
index b09f1d0..b744b56 100644
--- a/templates/about/task.html
+++ b/templates/about/task.html
@@ -3,7 +3,7 @@
     PyTasks - About - Task
 {% endblock %}
 {% block content %}
-    A task is an entity that people can work on and get pynts for their work. Every task has credits which are given to
+    A task is an entity that people can work on and get pynts for their work. Every task has pynts which are given to
     users working on the task. A task is created by a privileged user and he becomes a 
     reviewer <sup><a href="/about/reviewer/" target="_blank">learn more</a></sup> for the task. 
     The task if open, can be claimed by other users if they would like to work on the task.<br /><br />
diff --git a/templates/about/tasklife.html b/templates/about/tasklife.html
index 144b3cb..448b9d9 100644
--- a/templates/about/tasklife.html
+++ b/templates/about/tasklife.html
@@ -22,9 +22,9 @@
      Also selecting a user to work on the task implies the task has all its dependencies satisfied.<br /><br />
      
      During the working stage of task, a reviewer can request assign of pynts to users working on task or the reviewers. The assign pynts link 
-     will be available to reviewer on the task page. If there are no users working, the reviewer can request assign of credits to himself
+     will be available to reviewer on the task page. If there are no users working, the reviewer can request assign of pynts to himself
      or one of the other reviewers, who ever has done work on the task. Even if there are no users working on task, if there is a 
-     request for assign of credits to the task implies that someone has worked on the task and hence dependencies cannot be 
+     request for assign of pynts to the task implies that someone has worked on the task and hence dependencies cannot be 
      added after that.<br /><br />
      
      The users can be selected to work or removed from working users at any point in time. If a user is removed, he can claim again
diff --git a/templates/task/assigncredits.html b/templates/task/assignpynts.html
index eff23bf..cbd0f84 100644
--- a/templates/task/assigncredits.html
+++ b/templates/task/assignpynts.html
@@ -9,13 +9,13 @@
         {{form.as_p}}
         <input type="submit" value="Submit">
         </form>
-        {% if prev_credits %}
+        {% if prev_pynts %}
             <a href="/task/complete/tid={{task.id}}">Mark task as complete.</a>
             <hr />
         {% endif %}
-        {% if credit_requests %}
-            <br/>Previous credits:<br />
-            {% for req in credit_requests %}
+        {% if pynt_requests %}
+            <br/>Previous pynts:<br />
+            {% for req in pynt_requests %}
             <hr />
                 <a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a> requested assigning of {{req.pynts}} pynts to
                 <a href="/user/view/uid={{req.receiving_user.id}}">{{req.receiving_user.username}}</a>
diff --git a/templates/task/close.html b/templates/task/close.html
index f848edc..ea4cef0 100644
--- a/templates/task/close.html
+++ b/templates/task/close.html
@@ -5,8 +5,8 @@
 {% block content %}
     <b>Disclaimer:</b><br />
     If a task is closed, it implies the task is no more a valid task. The task cannot be edited or added subtasks/dependencies.
-    Please <a href="/task/assigncredits/tid={{task.id}}">click here</a> to return to assign credits page if you want to request assign of credits.
-    You cannot request assign of credits and all the pending requests on this task will be made invalid when a task is closed.<br /><br />
+    Please <a href="/task/assignpynts/tid={{task.id}}">click here</a> to return to assign pynts page if you want to request assign of pynts.
+    You cannot request assign of pynts and all the pending requests on this task will be made invalid when a task is closed.<br /><br />
     
     The only difference between marking a task as closed and completed is that the tasks depending on completed tasks will be free to be claimed 
     and worked on. This action cannot be undone. If you have double checked every thing, please provide a reason and close the task.<br />
diff --git a/templates/task/complete.html b/templates/task/complete.html
index b6d8747..a8aedd3 100644
--- a/templates/task/complete.html
+++ b/templates/task/complete.html
@@ -5,13 +5,13 @@
 {% block content %}
     <b>Disclaimer:</b><br />
     Marking a task as complete implies the task has been completed successfully. It implies that all the required files 
-    are available as attatchments in comments and all the users worked on this task were credited accordingly.<br /><br />
+    are available as attatchments in comments and all the users worked on this task were pynted accordingly.<br /><br />
     This action sets the task as completed and frees all the tasks depending on this task. Henceforth, the task <strong>can not</strong> be 
     commented upon or edited by anyone.<br /><br />
-    If there are pending requests for assigning credits, they will be deleted and admins will not be able to approve those requests.
-    Hence you cannot assign credits to anyone for this task anymore. You must wait for the requests to be approved by any of the admins. 
-    If you would like to request for assigning more credits, return to assign credits page by clicking 
-    <a href="/task/assigncredits/tid={{task.id}}">here</a>.<br /><br />
+    If there are pending requests for assigning pynts, they will be deleted and admins will not be able to approve those requests.
+    Hence you cannot assign pynts to anyone for this task anymore. You must wait for the requests to be approved by any of the admins. 
+    If you would like to request for assigning more pynts, return to assign pynts page by clicking 
+    <a href="/task/assignpynts/tid={{task.id}}">here</a>.<br /><br />
     If you have double checked everything, confirm this action by clicking the button below.
     <form action="" method="post">
         <input value="Mark as Complete" type="submit">
diff --git a/templates/task/view.html b/templates/task/view.html
index 61f2741..a671748 100644
--- a/templates/task/view.html
+++ b/templates/task/view.html
@@ -123,8 +123,8 @@
         <br />
     {% endif %}
     
-    {% if can_assign_credits %}
-        <a href="/task/assigncredits/tid={{task.id}}">View/Assign credits</a>
+    {% if can_assign_pynts %}
+        <a href="/task/assignpynts/tid={{task.id}}">View/Assign pynts</a>
     {% endif %}
     
     {% if task_claimable %}
diff --git a/templates/user/my_profile.html b/templates/user/my_profile.html
index cb3db1f..4f7e389 100644
--- a/templates/user/my_profile.html
+++ b/templates/user/my_profile.html
@@ -30,8 +30,8 @@
     {% if profile.dob %}
         <br><h4>Date of Birth</h4><hr>{{ profile.dob }}
     {% endif %}
-    {% if profile.credits %}
-        <br><h4>Credits</h4><hr>{{ profile.credits }}
+    {% if profile.pynts %}
+        <br><h4>Pynts</h4><hr>{{ profile.pynts }}
     {% endif %}
     {% if profile.foss_comm %}
         <br><h4>Foss Community</h4><hr>{{ profile.foss_comm }}