4 files changed, 13 insertions, 13 deletions
diff --git a/grc/converter/block.py b/grc/converter/block.py
index 04e5c905a0..0e362d97c0 100644
--- a/grc/converter/block.py
+++ b/grc/converter/block.py
@@ -95,14 +95,14 @@ def convert_block_xml(node):
 
     data['outputs'] = [convert_port_xml(port_node, converter.to_python_dec)
                        for port_node in node.iterfind('source')] or no_value
-
-    data['checks'] = [converter.to_python_dec(check_node.text)
-                      for check_node in node.iterfind('checks')] or no_value
     data['value'] = (
         converter.to_python_dec(node.findtext('var_value')) or
         ('${ value }' if block_id.startswith('variable') else no_value)
     )
 
+    data['asserts'] = [converter.to_python_dec(check_node.text)
+                       for check_node in node.iterfind('check')] or no_value
+
     data['templates'] = convert_templates(node, converter.to_mako, block_id) or no_value
 
     docs = node.findtext('doc')
diff --git a/grc/core/blocks/_build.py b/grc/core/blocks/_build.py
index 9a50086cea..9221433387 100644
--- a/grc/core/blocks/_build.py
+++ b/grc/core/blocks/_build.py
@@ -25,7 +25,7 @@ from ._templates import MakoTemplates
 
 
 def build(id, label='', category='', flags='', documentation='',
-          checks=None, value=None,
+          value=None, asserts=None,
           parameters=None, inputs=None, outputs=None, templates=None, **kwargs):
     block_id = id
 
@@ -41,7 +41,7 @@ def build(id, label='', category='', flags='', documentation='',
 
     cls.documentation = {'': documentation.strip('\n\t ').replace('\\\n', '')}
 
-    cls.checks = [_single_mako_expr(check, block_id) for check in (checks or [])]
+    cls.asserts = [_single_mako_expr(a, block_id) for a in (asserts or [])]
 
     cls.parameters_data = parameters or []
     cls.inputs_data = inputs or []
diff --git a/grc/core/blocks/block.py b/grc/core/blocks/block.py
index 0d8a779486..adc046936d 100644
--- a/grc/core/blocks/block.py
+++ b/grc/core/blocks/block.py
@@ -55,7 +55,7 @@ class Block(Element):
     documentation = {'': ''}
 
     value = None
-    checks = []
+    asserts = []
 
     templates = MakoTemplates()
     parameters_data = []
@@ -190,18 +190,18 @@ class Block(Element):
         Evaluate the checks: each check must evaluate to True.
         """
         Element.validate(self)
-        self._run_checks()
+        self._run_asserts()
         self._validate_generate_mode_compat()
         self._validate_var_value()
 
-    def _run_checks(self):
+    def _run_asserts(self):
         """Evaluate the checks"""
-        for check in self.checks:
+        for expr in self.asserts:
             try:
-                if not self.evaluate(check):
-                    self.add_error_message('Check "{}" failed.'.format(check))
+                if not self.evaluate(expr):
+                    self.add_error_message('Assertion "{}" failed.'.format(expr))
             except:
-                self.add_error_message('Check "{}" did not evaluate.'.format(check))
+                self.add_error_message('Assertion "{}" did not evaluate.'.format(expr))
 
     def _validate_generate_mode_compat(self):
         """check if this is a GUI block and matches the selected generate option"""
diff --git a/grc/core/schema_checker/block.py b/grc/core/schema_checker/block.py
index db8830fddf..ea079b4276 100644
--- a/grc/core/schema_checker/block.py
+++ b/grc/core/schema_checker/block.py
@@ -44,7 +44,7 @@ BLOCK_SCHEME = expand(
     inputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME),
     outputs=Spec(types=list, required=False, item_scheme=PORT_SCHEME),
 
-    checks=(list, str_),
+    asserts=(list, str_),
     value=str_,
 
     templates=Spec(types=dict, required=False, item_scheme=TEMPLATES_SCHEME),