Advertise the right name
Miscellaneous config corrections