Rename stuff
Tweak npm scripts