Updated name references
Merge from @OscarPDR's labman_ud
demos in scripts