diff --git a/prepare.py b/prepare.py
index b7ff137bc..c051a254f 100755
--- a/prepare.py
+++ b/prepare.py
@@ -118,8 +118,8 @@ class DesktopPreparator(prepare.Preparator):
             self.additional_args += ["-DCMAKE_SKIP_INSTALL_RPATH=YES"]
             self.additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"]
 
-    def check_tools(self):
-        ret = prepare.Preparator.check_tools(self)
+    def check_environment(self):
+        ret = prepare.Preparator.check_environment(self)
         if platform.system() == 'Windows':
             ret |= not self.check_is_installed('mingw-get', 'MinGW (https://sourceforge.net/projects/mingw/files/Installer/)')
         if "python" in self.args.target or "python-raspberry" in self.args.target:
@@ -198,9 +198,8 @@ help: help-prepare-options
 def main():
     preparator = DesktopPreparator()
     preparator.parse_args()
-    if preparator.check_tools() != 0:
-        preparator.show_missing_dependencies()
-        preparator.show_missing_python_dependencies()
+    if preparator.check_environment() != 0:
+        preparator.show_environment_errors()
         return 1
     return preparator.run()
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3a87033a1..a4fbcbee4 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3a87033a1366b7c62470c675137d5e0d6c16cbe6
+Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89