diff --git a/imagekit/imagecache/strategies.py b/imagekit/imagecache/strategies.py
index a0b8f76..56efbd7 100644
--- a/imagekit/imagecache/strategies.py
+++ b/imagekit/imagecache/strategies.py
@@ -20,13 +20,13 @@ class Optimistic(object):
 
     """
 
-    def on_cacheable_created(self, file):
+    def on_source_created(self, file):
         validate_now(file)
 
-    def on_cacheable_deleted(self, file):
+    def on_source_deleted(self, file):
         clear_now(file)
 
-    def on_cacheable_changed(self, file):
+    def on_source_changed(self, file):
         validate_now(file)
 
 
diff --git a/imagekit/registry.py b/imagekit/registry.py
index 258f252..6f48f9c 100644
--- a/imagekit/registry.py
+++ b/imagekit/registry.py
@@ -1,6 +1,6 @@
 from .exceptions import AlreadyRegistered, NotRegistered
-from .signals import (before_access, cacheable_created, cacheable_changed,
-                       cacheable_deleted)
+from .signals import (before_access, source_created, source_changed,
+                       source_deleted)
 
 
 class GeneratorRegistry(object):
@@ -54,9 +54,9 @@ class CacheableRegistry(object):
     """
 
     _signals = [
-        cacheable_created,
-        cacheable_changed,
-        cacheable_deleted,
+        source_created,
+        source_changed,
+        source_deleted,
     ]
 
     def __init__(self):
@@ -106,9 +106,9 @@ class CacheableRegistry(object):
         for generator in (generator_registry.get(id, cacheable=cacheable, **info)
                      for id in self._cacheables[cacheable]):
             event_name = {
-                cacheable_created: 'cacheable_created',
-                cacheable_changed: 'cacheable_changed',
-                cacheable_deleted: 'cacheable_deleted',
+                source_created: 'source_created',
+                source_changed: 'source_changed',
+                source_deleted: 'source_deleted',
             }
             generator._handle_cacheable_event(event_name, cacheable)
 
diff --git a/imagekit/signals.py b/imagekit/signals.py
index 97a9d9c..4c7aefa 100644
--- a/imagekit/signals.py
+++ b/imagekit/signals.py
@@ -1,6 +1,6 @@
 from django.dispatch import Signal
 
 before_access = Signal()
-cacheable_created = Signal(providing_args=[])
-cacheable_changed = Signal()
-cacheable_deleted = Signal()
+source_created = Signal(providing_args=[])
+source_changed = Signal()
+source_deleted = Signal()
diff --git a/imagekit/specs/sourcegroups.py b/imagekit/specs/sourcegroups.py
index 04c30c3..825276e 100644
--- a/imagekit/specs/sourcegroups.py
+++ b/imagekit/specs/sourcegroups.py
@@ -1,6 +1,6 @@
 from django.db.models.signals import post_init, post_save, post_delete
 from django.utils.functional import wraps
-from ..signals import cacheable_created, cacheable_changed, cacheable_deleted
+from ..signals import source_created, source_changed, source_deleted
 
 
 def ik_model_receiver(fn):
@@ -66,16 +66,16 @@ class ModelSignalRouter(object):
             new_hashes = self.update_source_hashes(instance)
             for attname, file in self.get_field_dict(instance).items():
                 if created:
-                    self.dispatch_signal(cacheable_created, file, sender,
+                    self.dispatch_signal(source_created, file, sender,
                                          instance, attname)
                 elif old_hashes[attname] != new_hashes[attname]:
-                    self.dispatch_signal(cacheable_changed, file, sender,
+                    self.dispatch_signal(source_changed, file, sender,
                                          instance, attname)
 
     @ik_model_receiver
     def post_delete_receiver(self, sender, instance=None, **kwargs):
         for attname, file in self.get_field_dict(instance).items():
-            self.dispatch_signal(cacheable_deleted, file, sender, instance,
+            self.dispatch_signal(source_deleted, file, sender, instance,
                                  attname)
 
     @ik_model_receiver