More namespace shuffling.