Whoops, better fix the shortnames too (nw)