Another fix to namespace change.