Global and module hooks

Fixes #69
Fixes #70
The rename needs a deprecation notice, here or below.