Remove 'manual' from key names

It seems redundant when you have the context of the format name.