Improved dictionary functions naming