Fix: Lets keep the SAP naming scheme and just change the NSDs used for the demo....