admin - more bug fixes in shipping

Got the input names and the data binds in sync. In some cases, changed
the names to be better indicators of what they are.