boards new split VENDOR_MODEL naming convention

Tools/docker_run.sh

@@ -2,7 +2,7 @@
 
 if [ -z ${PX4_DOCKER_REPO+x} ]; then
 	echo "guessing PX4_DOCKER_REPO based on input";
-	if [[ $@ =~ .*px4fmu.* ]]; then
+	if [[ $@ =~ .*px4_fmu.* ]]; then
 		# nuttx-px4fmu-v{1,2,3,4,5}
 		PX4_DOCKER_REPO="px4io/px4-dev-nuttx:2018-11-22"
 	elif [[ $@ =~ .*navio2.* ]] || [[ $@ =~ .*raspberry.* ]] || [[ $@ =~ .*bebop.* ]]; then

Tools/px_uploader.py

@@ -642,14 +642,14 @@ class uploader(object):
                                        % (self.fw_maxsize, fw.property('image_maxsize')))
         else:
             # If we're still on bootloader v4 on a Pixhawk, we don't know if we
-            # have the silicon errata and therefore need to flash px4fmu-v2
-            # with 1MB flash or if it supports px4fmu-v3 with 2MB flash.
+            # have the silicon errata and therefore need to flash px4_fmu-v2
+            # with 1MB flash or if it supports px4_fmu-v3 with 2MB flash.
             if fw.property('board_id') == 9 \
                     and fw.property('image_size') > 1032192 \
                     and not force:
                 raise RuntimeError("\nThe Board uses bootloader revision 4 and can therefore not determine\n"
-                                   "if flashing more than 1 MB (px4fmu-v3_default) is safe, chances are\n"
-                                   "high that it is not safe! If unsure, use px4fmu-v2_default.\n"
+                                   "if flashing more than 1 MB (px4_fmu-v3_default) is safe, chances are\n"
+                                   "high that it is not safe! If unsure, use px4_fmu-v2_default.\n"
                                    "\n"
                                    "If you know you that the board does not have the silicon errata, use\n"
                                    "this script with --force, or update the bootloader. If you are invoking\n"

Tools/sitl_multiple_run.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # run multiple instances of the 'px4' binary, but w/o starting the simulator.
-# It assumes px4 is already built, with 'make px4sitl_default'
+# It assumes px4 is already built, with 'make px4_sitl_default'
 
 # The simulator is expected to send to UDP port 14560+i for i in [0, N-1]
 # For example jmavsim can be run like this:
@@ -12,7 +12,7 @@ sitl_num=2
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 src_path="$SCRIPT_DIR/.."
 
-build_path=${src_path}/build/px4sitl_default
+build_path=${src_path}/build/px4_sitl_default
 
 echo "killing running instances"
 pkill -x px4 || true