correct the messaging to use the correct keys