Rename ns appropriately