Switch to using keys for various module data. Added 'name' to routing ta...

...ble.