Adjust mysql SET NAMES in remaining places as we agreed this was the go