diff --git a/mopidy/core.py b/mopidy/core.py
index c687aed1..747ef5fb 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -57,7 +57,7 @@ def setup_mixer():
     return get_class(settings.MIXER).start_proxy()
 
 def setup_backend():
-    # XXX Convert backend to one or more actors?
+    # TODO-PYKKA: Convert backend to one or more actors?
     return get_class(settings.BACKENDS[0])()
 
 def setup_frontends():
diff --git a/mopidy/frontends/mpd/__init__.py b/mopidy/frontends/mpd/__init__.py
index f4684b9d..3a1211ae 100644
--- a/mopidy/frontends/mpd/__init__.py
+++ b/mopidy/frontends/mpd/__init__.py
@@ -21,7 +21,7 @@ class MpdFrontend(ThreadingActor, BaseFrontend):
     """
 
     def __init__(self):
-        # XXX Do setup after actor starts?
+        # TODO-PYKKA: Do setup after actor starts?
         self._thread = MpdThread()
         self._thread.start()
 
diff --git a/mopidy/mixers/alsa.py b/mopidy/mixers/alsa.py
index 658677e5..f4f40ca1 100644
--- a/mopidy/mixers/alsa.py
+++ b/mopidy/mixers/alsa.py
@@ -23,7 +23,7 @@ class AlsaMixer(ThreadingActor, BaseMixer):
     """
 
     def __init__(self):
-        # XXX Do mixer detection after actor starts?
+        # PYKKA-TODO: Do mixer detection after actor starts?
         self._mixer = alsaaudio.Mixer(self._get_mixer_control())
         assert self._mixer is not None
 
diff --git a/mopidy/mixers/denon.py b/mopidy/mixers/denon.py
index 50c321b6..36f0f3bd 100644
--- a/mopidy/mixers/denon.py
+++ b/mopidy/mixers/denon.py
@@ -30,7 +30,7 @@ class DenonMixer(ThreadingActor, BaseMixer):
         Connects using the serial specifications from Denon's RS-232 Protocol
         specification: 9600bps 8N1.
         """
-        # XXX Do setup after actor starts?
+        # TODO-PYKKA: Do setup after actor starts?
         device = kwargs.get('device', None)
         if device:
             self._device = device
diff --git a/mopidy/mixers/gstreamer_software.py b/mopidy/mixers/gstreamer_software.py
index 95635794..f9d171ca 100644
--- a/mopidy/mixers/gstreamer_software.py
+++ b/mopidy/mixers/gstreamer_software.py
@@ -8,7 +8,7 @@ class GStreamerSoftwareMixer(ThreadingActor, BaseMixer):
     """Mixer which uses GStreamer to control volume in software."""
 
     def __init__(self):
-        # XXX Get reference to output without hardcoding GStreamerOutput
+        # TODO-PYKKA Get reference to output without hardcoding GStreamerOutput
         output_refs = ActorRegistry.get_by_class_name('GStreamerOutput')
         self.output = ActorProxy(output_refs[0])
 
diff --git a/mopidy/mixers/nad.py b/mopidy/mixers/nad.py
index 0765882d..90d5d5b2 100644
--- a/mopidy/mixers/nad.py
+++ b/mopidy/mixers/nad.py
@@ -75,7 +75,7 @@ class NadTalker(ThreadingActor):
     def __init__(self):
         self._device = None
 
-        # XXX Do after actor starts?
+        # TODO-PYKKA: Do after actor starts?
         self._setup()
 
     def _setup(self):
diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py
index 3fb58a2e..b0b98d99 100644
--- a/mopidy/outputs/gstreamer.py
+++ b/mopidy/outputs/gstreamer.py
@@ -24,7 +24,7 @@ class GStreamerOutput(ThreadingActor, BaseOutput):
     def __init__(self):
         self.gst_pipeline = None
 
-        # XXX Run setup after actor starts?
+        # TODO-PYKKA: Run setup after actor starts?
         self._setup_gstreamer()
 
     def _setup_gstreamer(self):