Adjust name spaces