Namespace changes and partial source move.