diff --git a/powerline/lint/markedjson/composer.py b/powerline/lint/markedjson/composer.py
index fe3c3b86..303e6f23 100644
--- a/powerline/lint/markedjson/composer.py
+++ b/powerline/lint/markedjson/composer.py
@@ -1,11 +1,11 @@
 __all__ = ['Composer', 'ComposerError']
 
-from .error import MarkedYAMLError
+from .error import MarkedError
 from .events import *  # NOQA
 from .nodes import *  # NOQA
 
 
-class ComposerError(MarkedYAMLError):
+class ComposerError(MarkedError):
 	pass
 
 
diff --git a/powerline/lint/markedjson/constructor.py b/powerline/lint/markedjson/constructor.py
index 35429a5d..bdc5c6e3 100644
--- a/powerline/lint/markedjson/constructor.py
+++ b/powerline/lint/markedjson/constructor.py
@@ -1,6 +1,6 @@
 __all__ = ['BaseConstructor', 'Constructor', 'ConstructorError']
 
-from .error import MarkedYAMLError
+from .error import MarkedError
 from .nodes import *  # NOQA
 from .markedvalue import gen_marked_value
 
@@ -23,7 +23,7 @@ def marked(func):
 	return f
 
 
-class ConstructorError(MarkedYAMLError):
+class ConstructorError(MarkedError):
 	pass
 
 
diff --git a/powerline/lint/markedjson/error.py b/powerline/lint/markedjson/error.py
index 0828c2c2..b9e10b34 100644
--- a/powerline/lint/markedjson/error.py
+++ b/powerline/lint/markedjson/error.py
@@ -1,4 +1,4 @@
-__all__ = ['Mark', 'YAMLError', 'MarkedYAMLError', 'echoerr']
+__all__ = ['Mark', 'JSONError', 'MarkedError', 'echoerr']
 
 
 import sys
@@ -53,7 +53,7 @@ class Mark:
 			return where.encode('utf-8')
 
 
-class YAMLError(Exception):
+class JSONError(Exception):
 	pass
 
 
@@ -81,8 +81,8 @@ def format_error(context=None, context_mark=None, problem=None, problem_mark=Non
 	return '\n'.join(lines)
 
 
-class MarkedYAMLError(YAMLError):
+class MarkedError(JSONError):
 	def __init__(self, context=None, context_mark=None,
 			problem=None, problem_mark=None, note=None):
-		YAMLError.__init__(self, format_error(context, context_mark, problem,
+		JSONError.__init__(self, format_error(context, context_mark, problem,
 										problem_mark, note))
diff --git a/powerline/lint/markedjson/parser.py b/powerline/lint/markedjson/parser.py
index 5e0d473a..998de6db 100644
--- a/powerline/lint/markedjson/parser.py
+++ b/powerline/lint/markedjson/parser.py
@@ -1,11 +1,11 @@
 __all__ = ['Parser', 'ParserError']
 
-from .error import MarkedYAMLError
+from .error import MarkedError
 from .tokens import *  # NOQA
 from .events import *  # NOQA
 
 
-class ParserError(MarkedYAMLError):
+class ParserError(MarkedError):
 	pass
 
 
diff --git a/powerline/lint/markedjson/reader.py b/powerline/lint/markedjson/reader.py
index 1570efa2..536f16aa 100644
--- a/powerline/lint/markedjson/reader.py
+++ b/powerline/lint/markedjson/reader.py
@@ -3,7 +3,7 @@
 
 __all__ = ['Reader', 'ReaderError']
 
-from .error import YAMLError, Mark
+from .error import JSONError, Mark
 
 import codecs
 import re
@@ -15,7 +15,7 @@ except ImportError:
 	unichr = chr  # NOQA
 
 
-class ReaderError(YAMLError):
+class ReaderError(JSONError):
 	def __init__(self, name, position, character, encoding, reason):
 		self.name = name
 		self.character = character
diff --git a/powerline/lint/markedjson/resolver.py b/powerline/lint/markedjson/resolver.py
index 2121fb84..f628a872 100644
--- a/powerline/lint/markedjson/resolver.py
+++ b/powerline/lint/markedjson/resolver.py
@@ -1,12 +1,12 @@
 __all__ = ['BaseResolver', 'Resolver']
 
-from .error import MarkedYAMLError
+from .error import MarkedError
 from .nodes import *  # NOQA
 
 import re
 
 
-class ResolverError(MarkedYAMLError):
+class ResolverError(MarkedError):
 	pass
 
 
diff --git a/powerline/lint/markedjson/scanner.py b/powerline/lint/markedjson/scanner.py
index ffbaa07c..a5750e82 100644
--- a/powerline/lint/markedjson/scanner.py
+++ b/powerline/lint/markedjson/scanner.py
@@ -16,11 +16,11 @@
 
 __all__ = ['Scanner', 'ScannerError']
 
-from .error import MarkedYAMLError
+from .error import MarkedError
 from .tokens import *  # NOQA
 
 
-class ScannerError(MarkedYAMLError):
+class ScannerError(MarkedError):
 	pass