Rename dictionaries. Fixes #466.