Some namespace clean up.