Fix some typos
Introduce an Env type for name maps