Rename HOP_RANGE to hop_range because it's no longer a macro.
Rename hash tables to comply with naming conventions.