using hash_key and value rules
small renames