#99 renaming dictionary items for consistency