CB-2381: fix for create scripts using sample application name + package all the time