Most if not all namespace changes made