diff --git a/dokku b/dokku
index b797a61f9..3310ceeed 100755
--- a/dokku
+++ b/dokku
@@ -42,15 +42,15 @@ fi
 case "$1" in
   receive)
     APP="$2"; IMAGE="dokku/$APP"
-    info1 "Cleaning up ..."
+    dokku_log_info1 "Cleaning up ..."
     dokku cleanup
-    info1 "Building $APP ..."
+    dokku_log_info1 "Building $APP ..."
     cat | dokku build $APP
-    info1 "Releasing $APP ..."
+    dokku_log_info1 "Releasing $APP ..."
     dokku release $APP
-    info1 "Deploying $APP ..."
+    dokku_log_info1 "Deploying $APP ..."
     dokku deploy $APP
-    info2 "Application deployed:"
+    dokku_log_info2 "Application deployed:"
          dokku urls $APP | sed "s/^/       /"
     echo
     ;;
@@ -124,7 +124,7 @@ case "$1" in
 
     # run checks first, then post-deploy hooks, which switches Nginx traffic
     trap kill_new INT TERM EXIT
-    info1 "Running pre-flight checks"
+    dokku_log_info1 "Running pre-flight checks"
     pluginhook check-deploy $id $APP $port ${ipaddr:-localhost}
 
     # now using the new container
@@ -132,7 +132,7 @@ case "$1" in
     echo $port > "$DOKKU_ROOT/$APP/PORT"
     echo "http://$(< "$DOKKU_ROOT/HOSTNAME"):$port" > "$DOKKU_ROOT/$APP/URL"
 
-    info1 "Running post-deploy"
+    dokku_log_info1 "Running post-deploy"
     pluginhook post-deploy  $APP $port $ipaddr
     trap -        INT TERM EXIT
 
@@ -140,7 +140,7 @@ case "$1" in
     if [[ -n "$oldid" ]]; then
       # Let the old container finish processing requests, before terminating it
       WAIT="${DOKKU_WAIT_TO_RETIRE:-60}"
-      info1 "Shutting down old container in $WAIT seconds"
+      dokku_log_info1 "Shutting down old container in $WAIT seconds"
       (
         exec >/dev/null 2>/dev/null </dev/null
         trap '' INT HUP
@@ -211,8 +211,8 @@ EOF
     done
 
     if [ "$implemented" -eq 0 ]; then
-      warn "\`$*\` is not a dokku command."
-      warn "See \`dokku help\` for a list of available commands."
+      dokku_log_warn "\`$*\` is not a dokku command."
+      dokku_log_warn "See \`dokku help\` for a list of available commands."
       exit 1
     fi
     ;;
diff --git a/plugins/apps/commands b/plugins/apps/commands
index 4449635dc..a82aa1e4f 100755
--- a/plugins/apps/commands
+++ b/plugins/apps/commands
@@ -4,13 +4,13 @@ source "$(dirname $0)/../common/functions"
 
 case "$1" in
   apps)
-    info2 "My Apps"
+    dokku_log_info2_quiet "My Apps"
     find $DOKKU_ROOT -follow -maxdepth 1 -type d  \( ! -iname ".*" \)  -not -path $DOKKU_ROOT/tls | sed 's|^\./||g' | sed 's|'$DOKKU_ROOT'\/||' | tail -n +2 | sort
     ;;
 
   apps:create)
     [[ -z $2 ]] && echo "Please specify an app to run the command on" && exit 1
-    [[ -d "$DOKKU_ROOT/$2" ]] && warn "Name is already taken" && exit 1
+    [[ -d "$DOKKU_ROOT/$2" ]] && dokku_log_warn "Name is already taken" && exit 1
     APP="$2"
 
     mkdir -p "$DOKKU_ROOT/$APP"
@@ -25,14 +25,14 @@ case "$1" in
 
     [[ "$3" == "force" ]] && DOKKU_APPS_FORCE_DELETE=1
     if [[ -z "$DOKKU_APPS_FORCE_DELETE" ]]; then
-      warn "WARNING: Potentially Destructive Action"
-      warn "This command will destroy $APP (including all add-ons)."
-      warn "To proceed, type \"$APP\""
+      dokku_log_warn "WARNING: Potentially Destructive Action"
+      dokku_log_warn "This command will destroy $APP (including all add-ons)."
+      dokku_log_warn "To proceed, type \"$APP\""
       echo ""
 
       read -p "> " app_name
       if [[ "$app_name" != "$APP" ]]; then
-        warn "Confirmation did not match $APP. Aborted."
+        dokku_log_warn "Confirmation did not match $APP. Aborted."
         exit 1
       fi
     fi
diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build
index 9cd90807c..716a18224 100755
--- a/plugins/build-env/pre-build
+++ b/plugins/build-env/pre-build
@@ -18,7 +18,7 @@ if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then
 fi
 
 if [[ ! -z "$BUILD_ENV" ]]; then
-  info1 "Adding BUILD_ENV to build environment..."
+  dokku_log_info1 "Adding BUILD_ENV to build environment..."
   # create build env files for use in buildpacks like this:
   # https://github.com/niteoweb/heroku-buildpack-buildout/blob/5879fa3418f7d8e079f1aa5816ba1adde73f4948/bin/compile#L34
   id=$(echo $BUILD_ENV |sed 's@export @@g'| docker run -i -a stdin $IMAGE /bin/bash -c "for ENV_VAR in $(cat); do echo \$ENV_VAR |sed 's@^\([^=]*\)=\(.*\)\$@echo \\\"\2\\\" >/tmp/env/\1@g' >>/tmp/set_env.sh; done && mkdir -p /tmp/env && /bin/bash /tmp/set_env.sh")
diff --git a/plugins/common/functions b/plugins/common/functions
index 4a30e01c3..1aae487f5 100644
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -9,15 +9,15 @@ function has_tty() {
   fi
 }
 
-function info1() {
+function dokku_log_info1() {
   echo "-----> $@"
 }
 
-function info2() {
+function dokku_log_info2() {
   echo "=====> $@"
 }
 
-function info1_quiet() {
+function dokku_log_info1_quiet() {
   if [[ -z "$DOKKU_QUIET_OUTPUT" ]];then
     echo "-----> $@"
   else
@@ -25,7 +25,7 @@ function info1_quiet() {
   fi
 }
 
-function info2_quiet() {
+function dokku_log_info2_quiet() {
   if [[ -z "$DOKKU_QUIET_OUTPUT" ]];then
     echo "=====> $@"
   else
@@ -33,22 +33,22 @@ function info2_quiet() {
   fi
 }
 
-function verbose() {
+function dokku_log_verbose() {
   echo "       $@"
 }
 
-function warn() {
+function dokku_log_warn() {
   echo " !    $@"
 }
 
-function fail() {
+function dokku_log_fail() {
   echo "$@" 1>&2
   exit 1
 }
 
 function verify_app_name() {
   local APP="$1"
-  [[ ! -d "$DOKKU_ROOT/$APP" ]] && fail "App $APP does not exist"
+  [[ ! -d "$DOKKU_ROOT/$APP" ]] && dokku_log_fail "App $APP does not exist"
   return 0
 }
 
diff --git a/plugins/config/commands b/plugins/config/commands
index a12b509d5..115a03b65 100755
--- a/plugins/config/commands
+++ b/plugins/config/commands
@@ -65,7 +65,7 @@ case "$1" in
       fi
     done
 
-    info2 "$APP config vars"
+    dokku_log_info2_quiet "$APP config vars"
     config_styled_hash "$VARS"
     ;;
 
@@ -131,7 +131,7 @@ ${var}"
     ENV_ADD=$(echo "$ENV_ADD" | tail -n +2) #remove first empty line
 
     if [ $RESTART_APP ]; then
-      info1 "Setting config vars and restarting $APP"
+      dokku_log_info1 "Setting config vars and restarting $APP"
       config_styled_hash "$ENV_ADD" "       "
 
       config_write "$ENV_TEMP"
@@ -154,7 +154,7 @@ ${var}"
     VARS="${*:3}"
 
     for var in $VARS; do
-      info1 "Unsetting $var and restarting $APP"
+      dokku_log_info1 "Unsetting $var and restarting $APP"
       ENV_TEMP=$(echo -e "${ENV_TEMP}" | sed "/^export $var=/ d")
 
       config_write "$ENV_TEMP"
diff --git a/plugins/domains/commands b/plugins/domains/commands
index 00a34f51c..771bebe41 100755
--- a/plugins/domains/commands
+++ b/plugins/domains/commands
@@ -24,7 +24,7 @@ case "$1" in
     APP="$2"
 
     dokku domains:setup $APP
-    info2 "$APP Domain Names"
+    dokku_log_info2_quiet "$APP Domain Names"
     cat "$DOKKU_ROOT/$APP/VHOST"
     ;;
 
@@ -44,7 +44,7 @@ case "$1" in
         [[ ! $(grep -q NO_VHOST "$DOKKU_ROOT/$APP/ENV") ]] && echo "export NO_VHOST='1'" >> "$DOKKU_ROOT/$APP/ENV"
       else
         if [[ -f "$DOKKU_ROOT/VHOST" ]]; then
-          info1 "Creating new $VHOST_PATH..."
+          dokku_log_info1 "Creating new $VHOST_PATH..."
           SUBDOMAIN=${APP/%\.${VHOST}/}
           hostname=$(: | pluginhook nginx-hostname $APP $SUBDOMAIN $VHOST)
           if [[ ! -n $hostname ]]; then
@@ -82,7 +82,7 @@ case "$1" in
     # we need to restart the app to make sure we're binding to the appropriate network interface
     dokku ps:restart $APP
     pluginhook post-domains-update $APP
-    info1 "Added $3 to $APP"
+    dokku_log_info1 "Added $3 to $APP"
 
     ;;
 
@@ -94,7 +94,7 @@ case "$1" in
     rm -f "$DOKKU_ROOT/$APP/VHOST"
     dokku domains:setup $APP
     pluginhook post-domains-update $APP
-    info1 "Cleared domains in $APP"
+    dokku_log_info1 "Cleared domains in $APP"
 
     ;;
 
@@ -112,7 +112,7 @@ case "$1" in
     dokku domains:setup $APP
     sed -i "/^$3$/d" "$DOKKU_ROOT/$APP/VHOST"
     pluginhook post-domains-update $APP
-    info1 "Removed $3 from $APP"
+    dokku_log_info1 "Removed $3 from $APP"
 
     ;;
 
diff --git a/plugins/nginx-vhosts/commands b/plugins/nginx-vhosts/commands
index 1267960f9..1d0a9db23 100755
--- a/plugins/nginx-vhosts/commands
+++ b/plugins/nginx-vhosts/commands
@@ -63,7 +63,7 @@ EOF
         NONSSL_VHOSTS=$(egrep -v "^${SSL_HOSTNAME}$|^${SSL_HOSTNAME_ALT}$" $VHOST_PATH || exit 0)
 
         while read line; do
-          info1 "Configuring SSL for $line..."
+          dokku_log_info1 "Configuring SSL for $line..."
           SSL_SERVER_NAME=$line
           eval "cat <<< \"$(< $NGINX_CONF)\" >> $DOKKU_ROOT/$APP/nginx.conf"
         done <<< "$SSL_VHOSTS"
@@ -71,7 +71,7 @@ EOF
 
       APP_NGINX_TEMPLATE="$DOKKU_ROOT/$APP/nginx.conf.template"
       if [[ -f $APP_NGINX_TEMPLATE ]]; then
-        info1 "Overriding default nginx.conf with detected nginx.conf.template"
+        dokku_log_info1 "Overriding default nginx.conf with detected nginx.conf.template"
         NGINX_CONF=$APP_NGINX_TEMPLATE
       fi
 
@@ -80,11 +80,11 @@ EOF
       NOSSL_SERVER_NAME=$(echo $NONSSL_VHOSTS $SSL_VHOSTS| tr '\n' ' ')
 
       if [[ -n "$DOKKU_APP_LISTEN_PORT" ]] && [[ -n "$DOKKU_APP_LISTEN_IP" ]]; then
-        info1 "Creating $SCHEME nginx.conf"
+        dokku_log_info1 "Creating $SCHEME nginx.conf"
         echo "upstream $APP { server $DOKKU_APP_LISTEN_IP:$DOKKU_APP_LISTEN_PORT; }" > $DOKKU_ROOT/$APP/nginx.conf
         eval "cat <<< \"$(< $NGINX_CONF)\" >> $DOKKU_ROOT/$APP/nginx.conf"
 
-        info1 "Running nginx-pre-reload"
+        dokku_log_info1 "Running nginx-pre-reload"
         pluginhook nginx-pre-reload $APP $DOKKU_APP_LISTEN_PORT $DOKKU_APP_LISTEN_IP
 
         echo "       Reloading nginx"
@@ -92,14 +92,14 @@ EOF
       fi
     else
       if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
-        info1 "VHOST support disabled, deleting $APP/VHOST"
+        dokku_log_info1 "VHOST support disabled, deleting $APP/VHOST"
         rm "$DOKKU_ROOT/$APP/VHOST"
       fi
       if [[ -f "$DOKKU_ROOT/$APP/nginx.conf" ]]; then
-        info1 "VHOST support disabled, deleting nginx.conf"
+        dokku_log_info1 "VHOST support disabled, deleting nginx.conf"
         rm "$DOKKU_ROOT/$APP/nginx.conf"
 
-        info1 "VHOST support disabled, reloading nginx after nginx.conf deletion"
+        dokku_log_info1 "VHOST support disabled, reloading nginx after nginx.conf deletion"
         restart_nginx
       fi
     fi
diff --git a/plugins/nginx-vhosts/post-deploy b/plugins/nginx-vhosts/post-deploy
index 209c150c3..db457b8c7 100755
--- a/plugins/nginx-vhosts/post-deploy
+++ b/plugins/nginx-vhosts/post-deploy
@@ -7,7 +7,7 @@ APP="$1"; PORT="$2"; IP="$3"
 set +e; NO_VHOST=$(dokku config:get $APP NO_VHOST); set -e
 
 if [[ -n "$NO_VHOST" ]]; then
-  info1 "NO_VHOST config detected"
+  dokku_log_info1 "NO_VHOST config detected"
 elif [[ ! -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
   dokku domains:setup $APP
 fi
diff --git a/plugins/ps/commands b/plugins/ps/commands
index 76928512b..ed45415f7 100755
--- a/plugins/ps/commands
+++ b/plugins/ps/commands
@@ -7,12 +7,12 @@ release_and_deploy() {
   local APP="$1";
 
   if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
-    info1 "Releasing $APP ..."
+    dokku_log_info1 "Releasing $APP ..."
     dokku release $APP
-    info1 "Release complete!"
-    info1 "Deploying $APP ..."
+    dokku_log_info1 "Release complete!"
+    dokku_log_info1 "Deploying $APP ..."
     dokku deploy $APP
-    info2 "Application deployed:"
+    dokku_log_info2 "Application deployed:"
          dokku urls $APP | sed "s/^/       /"
     echo
   fi