diff --git a/extract-files.sh b/extract-files.sh
index 4a50a54..034eed2 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -1,7 +1,25 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 set -e
 
-export VENDOR=motorola
+# Required!
 export DEVICE=peregrine
-./../../$VENDOR/msm8226-common/extract-files.sh $@
+export DEVICE_COMMON=msm8226-common
+export VENDOR=motorola
+
+./../../$VENDOR/$DEVICE_COMMON/extract-files.sh $@
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 8179e1f..dc8a30f 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -1,7 +1,25 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Copyright (C) 2016 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 set -e
 
+# Required!
 export DEVICE=peregrine
+export DEVICE_COMMON=msm8226-common
 export VENDOR=motorola
-./../../$VENDOR/msm8226-common/setup-makefiles.sh $@
+
+./../../$VENDOR/$DEVICE_COMMON/setup-makefiles.sh $@