Change hash names for clarity