h2h update refactoring, renaming