Begin work on hooking system, unify naming