Rename some keys to make the code a bit better readable