expanding out names
scripted update of code from master at cd642b9 expanding out names