Update mocks for the new namespace. Closes #3445.