Minor shutdown tweaks for the local naming.