Correct missing namespace changes in source