Fix module ref.
Cleanup extension cutpaste.
Fix env var name.