Fixes naming in bolts for options to work right after plan(name before g...

...oing to an identity key)