style: adopting consistent naming strategy

adopt consistent dictionary naming strategy as
identified from qa testing