fixed a naming conflict on key/id