diff --git a/layers/meta-nwl-distro/recipes-core/base-files/base-files-nwl.inc b/layers/meta-nwl-distro/recipes-core/base-files/base-files-nwl.inc
new file mode 100644
index 0000000..fb0eb64
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/base-files/base-files-nwl.inc
@@ -0,0 +1,26 @@
+# File in the base-files subdirectory of this recipe should overwrite the
+# same file in OE-Core
+FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:"
+
+BASEFILESISSUEINSTALL = "do_install_coreos_basefilesissue"
+
+do_install_coreos_basefilesissue() {
+	install -m 644 ${WORKDIR}/issue*  ${D}${sysconfdir}
+	
+    printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue
+	printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net
+
+	printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue
+	printf "${DISTRO_VERSION} " >> ${D}${sysconfdir}/issue.net
+	
+	printf "${COREOS_METADATA_BRANCH} " >> ${D}${sysconfdir}/issue
+	printf "${COREOS_METADATA_BRANCH} " >> ${D}${sysconfdir}/issue.net
+
+	printf "${COREOS_METADATA_REVISION} " >> ${D}${sysconfdir}/issue
+	printf "${COREOS_METADATA_REVISION} " >> ${D}${sysconfdir}/issue.net
+
+    printf "\\\n \\\l\n" >> ${D}${sysconfdir}/issue
+    echo >> ${D}${sysconfdir}/issue
+	echo "%h"    >> ${D}${sysconfdir}/issue.net
+	echo >> ${D}${sysconfdir}/issue.net
+}
diff --git a/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue b/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue
new file mode 100644
index 0000000..5f951ec
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue
@@ -0,0 +1,22 @@
+ _   _      _  ___  ___          _       _      
+| \\ | |    | | |  \\/  |         | |     | |     
+|  \\| | ___| |_| .  . | ___   __| |_   _| | ___ 
+| . ` |/ _ \\ __| |\\/| |/ _ \\ / _` | | | | |/ _ \\
+| |\\  |  __/ |_| |  | | (_) | (_| | |_| | |  __/
+\\_| \\_/\\___|\\__\\_|  |_/\\___/ \\__,_|\\__,_|_|\\___|
+                                                
+                                                
+ _    _ _          _                            
+| |  | (_)        | |                           
+| |  | |_ _ __ ___| | ___  ___ ___              
+| |/\\| | | '__/ _ \\ |/ _ \\/ __/ __|             
+\\  /\\  / | | |  __/ |  __/\\__ \\__ \\             
+ \\/  \\/|_|_|  \\___|_|\\___||___/___/             
+                                                
+                                                
+ _     _                                        
+| |   (_)                                       
+| |    _ _ __  _   ___  __                      
+| |   | | '_ \\| | | \\ \\/ /                      
+| |___| | | | | |_| |>  <                       
+\\_____/_|_| |_|\\__,_/_/\\_\\                      
diff --git a/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue.net b/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue.net
new file mode 100644
index 0000000..5f951ec
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/base-files/base-files/issue.net
@@ -0,0 +1,22 @@
+ _   _      _  ___  ___          _       _      
+| \\ | |    | | |  \\/  |         | |     | |     
+|  \\| | ___| |_| .  . | ___   __| |_   _| | ___ 
+| . ` |/ _ \\ __| |\\/| |/ _ \\ / _` | | | | |/ _ \\
+| |\\  |  __/ |_| |  | | (_) | (_| | |_| | |  __/
+\\_| \\_/\\___|\\__\\_|  |_/\\___/ \\__,_|\\__,_|_|\\___|
+                                                
+                                                
+ _    _ _          _                            
+| |  | (_)        | |                           
+| |  | |_ _ __ ___| | ___  ___ ___              
+| |/\\| | | '__/ _ \\ |/ _ \\/ __/ __|             
+\\  /\\  / | | |  __/ |  __/\\__ \\__ \\             
+ \\/  \\/|_|_|  \\___|_|\\___||___/___/             
+                                                
+                                                
+ _     _                                        
+| |   (_)                                       
+| |    _ _ __  _   ___  __                      
+| |   | | '_ \\| | | \\ \\/ /                      
+| |___| | | | | |_| |>  <                       
+\\_____/_|_| |_|\\__,_/_/\\_\\                      
diff --git a/layers/meta-nwl-distro/recipes-core/base-files/base-files_%.bbappend b/layers/meta-nwl-distro/recipes-core/base-files/base-files_%.bbappend
new file mode 100644
index 0000000..8b2d632
--- /dev/null
+++ b/layers/meta-nwl-distro/recipes-core/base-files/base-files_%.bbappend
@@ -0,0 +1,3 @@
+# NWL based distro should provide their own implementation of base-file to
+# have their custom branding and version info
+require ${@'base-files-nwl.inc' if d.getVar('DISTRO') == 'nwl' else ''}
diff --git a/nwl-init-build-env b/nwl-init-build-env
index 9c858bf..a29effe 100755
--- a/nwl-init-build-env
+++ b/nwl-init-build-env
@@ -5,31 +5,31 @@
 
 # On some shell, we can get the path of this script when sources. Otherwise we
 # use the current directory as a fallback
-if [ -z "$PRODUCT_ROOT" ]; then
+if [ -z "$NWL_ROOT" ]; then
     if [ -n "$BASH_SOURCE" ]; then
-        PRODUCT_ROOT=$(dirname "$BASH_SOURCE")
+        NWL_ROOT=$(dirname "$BASH_SOURCE")
     elif [ -n "$ZSH_NAME" ]; then
-        PRODUCT_ROOT=$(dirname "$0")
+        NWL_ROOT=$(dirname "$0")
     else
-        PRODUCT_ROOT="$(pwd)"
+        NWL_ROOT="$(pwd)"
     fi
 fi
 
 # Get a non relative path to the root directory
-PRODUCT_ROOT=$(readlink -f "${PRODUCT_ROOT}")
+NWL_ROOT=$(readlink -f "${NWL_ROOT}")
 
 # CoreOS init settings
-COREOS_ROOT="${PRODUCT_ROOT}/coreos"
-TEMPLATECONF="${PRODUCT_ROOT}/templates"
+COREOS_ROOT="${NWL_ROOT}/coreos"
+TEMPLATECONF="${NWL_ROOT}/templates"
 
 # Call the coreos-init-build-env scripts of CoreOS
-. "${COREOS_ROOT}/coreos-init-build-env" "${1:-$PRODUCT_ROOT/build}"
+. "${COREOS_ROOT}/coreos-init-build-env" "${1:-$NWL_ROOT/build}"
 
 # From here the scripts and functions defined by CoreOS and
 # OpenEmbedded-Core are available
 
-# Add support for ##PRODUCTS_LAYERSDIR## inside of bblayer template
-coreos-bblayers-envsub PRODUCT_LAYERSDIR "${PRODUCT_ROOT}/layers"
+# Add support for ##NWLS_LAYERSDIR## inside of bblayer template
+coreos-bblayers-envsub NWL_LAYERSDIR "${NWL_ROOT}/layers"
 
-# Add the scripts directory of the product to the path
-coreos_path_add "${PRODUCT_ROOT}/scripts"
+# Add the scripts directory of the NWL to the path
+coreos_path_add "${NWL_ROOT}/scripts"
diff --git a/templates/bblayers.conf.sample b/templates/bblayers.conf.sample
index ccc0dc2..de4b00d 100644
--- a/templates/bblayers.conf.sample
+++ b/templates/bblayers.conf.sample
@@ -9,7 +9,6 @@ BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##COREOS_LAYERSDIR##/meta-belden-coreos \
   ##COREOS_LAYERSDIR##/meta-belden-coreos-bsp \
-  ##COREOS_LAYERSDIR##/meta-belden-coreos-demo \
   ##COREOS_LAYERSDIR##/meta-belden-marvell-bsp \
   ##COREOS_LAYERSDIR##/meta-openembedded/meta-oe \
   ##COREOS_LAYERSDIR##/meta-openembedded/meta-networking \
@@ -19,4 +18,5 @@ BBLAYERS ?= " \
   ##COREOS_LAYERSDIR##/meta-virtualization \
   ##COREOS_LAYERSDIR##/meta-efibootguard \
   ##COREOS_LAYERSDIR##/meta-swupdate \
+  ##NWL_LAYERSDIR##/meta-nwl-distro \
   "
diff --git a/templates/conf-notes.txt b/templates/conf-notes.txt
index c4c8f7b..8e42e9d 100644
--- a/templates/conf-notes.txt
+++ b/templates/conf-notes.txt
@@ -1,9 +1,26 @@
-  ____       _     _               _____                ____   _____ 
- |  _ \     | |   | |             / ____|              / __ \ / ____|
- | |_) | ___| | __| | ___ _ __   | |     ___  _ __ ___| |  | | (___  
- |  _ < / _ \ |/ _` |/ _ \ '_ \  | |    / _ \| '__/ _ \ |  | |\___ \ 
- | |_) |  __/ | (_| |  __/ | | | | |___| (_) | | |  __/ |__| |____) |
- |____/ \___|_|\__,_|\___|_| |_|  \_____\___/|_|  \___|\____/|_____/ 
+ _   _      _  ___  ___          _       _      
+| \ | |    | | |  \/  |         | |     | |     
+|  \| | ___| |_| .  . | ___   __| |_   _| | ___ 
+| . ` |/ _ \ __| |\/| |/ _ \ / _` | | | | |/ _ \
+| |\  |  __/ |_| |  | | (_) | (_| | |_| | |  __/
+\_| \_/\___|\__\_|  |_/\___/ \__,_|\__,_|_|\___|
+                                                
+                                                
+ _    _ _          _                            
+| |  | (_)        | |                           
+| |  | |_ _ __ ___| | ___  ___ ___              
+| |/\| | | '__/ _ \ |/ _ \/ __/ __|             
+\  /\  / | | |  __/ |  __/\__ \__ \             
+ \/  \/|_|_|  \___|_|\___||___/___/             
+                                                
+                                                
+ _     _                                        
+| |   (_)                                       
+| |    _ _ __  _   ___  __                      
+| |   | | '_ \| | | \ \/ /                      
+| |___| | | | | |_| |>  <                       
+\_____/_|_| |_|\__,_/_/\_\                      
+                                 
  
 ### Shell environment set up for builds. ###