Fix hash consolidation. Problem with renaming int fields