- Clean up some namespace conflicts