little fix for the key names. prefixing with the type, not perfect but better..