Clean up name spaces a bit.