Clean up Pebblebed hostname nonsense, continued.