diff --git a/couchpotato/core/plugins/library/main.py b/couchpotato/core/plugins/library/main.py
index b45c7f8d..1f9dd6cc 100644
--- a/couchpotato/core/plugins/library/main.py
+++ b/couchpotato/core/plugins/library/main.py
@@ -60,7 +60,7 @@ class LibraryPlugin(Plugin):
         if library.status_id == done_status.get('id') and not force:
             do_update = False
         else:
-            info = fireEvent('provider.movie.info', merge = True, identifier = identifier)
+            info = fireEvent('movie.info', merge = True, identifier = identifier)
             if not info or len(info) == 0:
                 log.error('Could not update, no movie info to work with: %s' % identifier)
                 return False
diff --git a/couchpotato/core/plugins/movie/main.py b/couchpotato/core/plugins/movie/main.py
index dcf12311..b6f638b8 100644
--- a/couchpotato/core/plugins/movie/main.py
+++ b/couchpotato/core/plugins/movie/main.py
@@ -79,7 +79,7 @@ class MoviePlugin(Plugin):
         movies = Env.get('cache').get(cache_key)
 
         if not movies:
-            results = fireEvent('provider.movie.search', q = params.get('q'))
+            results = fireEvent('movie.search', q = params.get('q'), merge = True)
 
             # Combine movie results
             movies = []
diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
index fe9ce2b7..f4e267c3 100644
--- a/couchpotato/core/plugins/scanner/main.py
+++ b/couchpotato/core/plugins/scanner/main.py
@@ -318,7 +318,7 @@ class Scanner(Plugin):
         # Search based on OpenSubtitleHash
         if not imdb_id and not group['is_dvd']:
             for file in files['movie']:
-                movie = fireEvent('provider.movie.by_hash', file = file, merge = True)
+                movie = fireEvent('movie.by_hash', file = file, merge = True)
 
                 if len(movie) > 0:
                     imdb_id = movie[0]['imdb']
@@ -330,7 +330,7 @@ class Scanner(Plugin):
 
                 if len(identifier) > 2:
 
-                    movie = fireEvent('provider.movie.search', q = identifier, merge = True, limit = 1)
+                    movie = fireEvent('movie.search', q = identifier, merge = True, limit = 1)
 
                     if len(movie) > 0:
                         imdb_id = movie[0]['imdb']
@@ -339,7 +339,7 @@ class Scanner(Plugin):
                     log.debug('Identifier to short to use for search: %s' % identifier)
 
         if imdb_id:
-            #movie = fireEvent('provider.movie.info', identifier = imdb_id, merge = True)
+            #movie = fireEvent('movie.info', identifier = imdb_id, merge = True)
             #if movie and movie.get('imdb'):
             return fireEvent('library.add', attrs = {
                 'identifier': imdb_id
diff --git a/couchpotato/core/plugins/searcher/main.py b/couchpotato/core/plugins/searcher/main.py
index 8cc8e509..6e07f0ee 100644
--- a/couchpotato/core/plugins/searcher/main.py
+++ b/couchpotato/core/plugins/searcher/main.py
@@ -66,7 +66,7 @@ class Searcher(Plugin):
             if has_better_quality is 0:
 
                 log.info('Search for %s in %s' % (default_title, type['quality']['label']))
-                results = fireEvent('provider.yarr.search', movie, type['quality'], merge = True)
+                results = fireEvent('yarr.search', movie, type['quality'], merge = True)
                 sorted_results = sorted(results, key = lambda k: k['score'], reverse = True)
 
                 # Add them to this movie releases list
diff --git a/couchpotato/core/providers/movie/couchpotatoapi/main.py b/couchpotato/core/providers/movie/couchpotatoapi/main.py
index 3f861038..c2e02110 100644
--- a/couchpotato/core/providers/movie/couchpotatoapi/main.py
+++ b/couchpotato/core/providers/movie/couchpotatoapi/main.py
@@ -15,7 +15,7 @@ class CouchPotatoApi(MovieProvider):
     apiUrl = 'http://couchpotatoapp.com/api/%s/'
 
     def __init__(self):
-        addEvent('provider.movie.release_date', self.releaseDate)
+        addEvent('movie.release_date', self.releaseDate)
         addApiView('movie.suggest', self.suggestView)
 
     def releaseDate(self, imdb_id):
diff --git a/couchpotato/core/providers/movie/imdb/main.py b/couchpotato/core/providers/movie/imdb/main.py
index 0b9cddf3..a7ba2e0c 100644
--- a/couchpotato/core/providers/movie/imdb/main.py
+++ b/couchpotato/core/providers/movie/imdb/main.py
@@ -10,7 +10,7 @@ class IMDB(MovieProvider):
 
     def __init__(self):
 
-        #addEvent('provider.movie.search', self.search)
+        #addEvent('movie.search', self.search)
 
         self.p = IMDb('http')
 
diff --git a/couchpotato/core/providers/movie/themoviedb/main.py b/couchpotato/core/providers/movie/themoviedb/main.py
index c76d8341..a53bc208 100644
--- a/couchpotato/core/providers/movie/themoviedb/main.py
+++ b/couchpotato/core/providers/movie/themoviedb/main.py
@@ -14,9 +14,9 @@ class TheMovieDb(MovieProvider):
     imageUrl = 'http://hwcdn.themoviedb.org'
 
     def __init__(self):
-        addEvent('provider.movie.by_hash', self.byHash)
-        addEvent('provider.movie.search', self.search)
-        addEvent('provider.movie.info', self.getInfo)
+        addEvent('movie.by_hash', self.byHash)
+        addEvent('movie.search', self.search)
+        addEvent('movie.info', self.getInfo)
 
         # Use base wrapper
         tmdb.Config.api_key = self.conf('api_key')