diff --git a/prepare.py b/prepare.py
index 0e82f935a..6af46c5e8 100755
--- a/prepare.py
+++ b/prepare.py
@@ -165,9 +165,9 @@ class IOSPreparator(prepare.Preparator):
             error("No package manager found. Please README or install brew using:\n\truby -e \"$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)\"")
             return "brew"
 
-    def check_tools(self):
+    def check_environment(self):
         reterr = 0
-        reterr |= prepare.Preparator.check_tools(self)
+        reterr |= prepare.Preparator.check_environment(self)
         package_manager_info = {"brew-pkg-config": "pkg-config",
                                 "sudo port-pkg-config": "pkgconfig",
                                 "brew-binary-path": "/usr/local/bin/",
@@ -343,8 +343,8 @@ help: help-prepare-options
 def main():
     preparator = IOSPreparator()
     preparator.parse_args()
-    if preparator.check_tools() != 0:
-        preparator.show_missing_dependencies()
+    if preparator.check_environment() != 0:
+        preparator.show_environment_errors()
         return 1
     preparator.install_git_hook()
     return preparator.run()
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3ac4d6737..a4fbcbee4 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3ac4d6737a179f26f3823decdc681193ff39d9a3
+Subproject commit a4fbcbee40e7c9b9ef3ec3f7b0e95e3440906d89