diff --git a/content_plugins/base.py b/content_plugins/base.py
index 862c130..1506165 100644
--- a/content_plugins/base.py
+++ b/content_plugins/base.py
@@ -49,7 +49,7 @@ class BasePlugin(models.Model):
 
     @classmethod
     def register_with_renderer(cls, renderer):
-        renderer.register_template_renderer(cls, cls.get_template, cls.get_context_data)
+        renderer.register_template_renderer(cls, cls.get_template, cls.get_plugin_context)
 
     def get_template_names(self):
         t = getattr(self, 'template_name', None)
@@ -69,13 +69,16 @@ class BasePlugin(models.Model):
         """
         return self.get_template_names()
 
-    def get_context_data(self, context=None, **kwargs):
-        context = context or {}
-        context['content'] = self
-        context['parent'] = self.parent
+    def get_plugin_context(self, context=None, **kwargs):
+        """
+        Returns a dict.
+        """
+        plugin_context = {}
+        plugin_context['content'] = self
+        plugin_context['parent'] = self.parent
         if 'request_context' in kwargs:
-            context['request'] = getattr(kwargs['request_context'], 'request', None)
-        return context
+            plugin_context['request'] = getattr(kwargs['request_context'], 'request', None)
+        return plugin_context
 
     # For rendering the template's render() method is used
 
@@ -165,8 +168,8 @@ class SectionBase(StyleMixin, BasePlugin):
             <h2>{{ subheading }}</h2>
         """)
 
-    def get_context_data(self, context=None, **kwargs):
-        context = super().get_context_data(context=context, **kwargs)
+    def get_plugin_context(self, context=None, **kwargs):
+        context = super().get_plugin_context(context=None, **kwargs)
         context['slug'] = self.slug
         context['subheading'] = self.subheading
         return context
diff --git a/content_plugins/plugins/mixins.py b/content_plugins/plugins/mixins.py
index ee845e2..c05babf 100644
--- a/content_plugins/plugins/mixins.py
+++ b/content_plugins/plugins/mixins.py
@@ -45,10 +45,10 @@ class StyleMixin(models.Model):
             )
         ]
 
-    def get_context_data(self, context=None, **kwargs):
-        if hasattr(super(), 'get_context_data'):
-            context = super().get_context_data(context=context, **kwargs)
+    def get_plugin_context(self, context=None, **kwargs):
+        if hasattr(super(), 'get_plugin_context'):
+            context = super().get_plugin_context(**kwargs)
         else:
-            context = context or {}
+            context = {}
         context['style'] = self.get_style_slug()
         return context