More namespace cleanup