Change some names
Cli help, changed OpenStruct