Change keys for dictionaries to make them more pythonic