Dictionary: Make names more intuitive.