diff --git a/cms/djangoapps/contentstore/views.py b/cms/djangoapps/contentstore/views.py
index e29c41ea59..ad846fb369 100644
--- a/cms/djangoapps/contentstore/views.py
+++ b/cms/djangoapps/contentstore/views.py
@@ -4,7 +4,7 @@ from django.contrib.auth.decorators import login_required
 
 
 def index(request):
-    # FIXME (cpennington): These need to be read in from the active user
+    # TODO (cpennington): These need to be read in from the active user
     org = 'mit.edu'
     course = '6002xs12'
     course = keystore().get_item(['i4x', org, course, 'Course', None])
diff --git a/doc/code_standards.txt b/doc/code_standards.txt
index a4833b8d36..122dde228b 100644
--- a/doc/code_standards.txt
+++ b/doc/code_standards.txt
@@ -107,3 +107,6 @@ If code qualifies:
 * When impossible, it should live in the github repo. 
 * Discussion should live on github, Basecamp or Pivotal, depending on
   context.
+* Notes for later fixes should in general be put into Pivotal as stories.
+  If they are left in the code, they should be prefixed by
+  # TODO (<name>)