Improve dict name