update names, append semicolons almost everywhere, and add ngw