Small tweaks

* normalizing names, matching TS defaults a bit better