fix key-value names