Update NPM module name; cleanup