npm support: simplify and rename