Make corrections to name spaces.