updated hash names to be more generic