Improve formatting and update PDU and transaction key names