fixups on bad key naming