fixing key naming