Removed more reference to the old exporter name.
Merge remote-tracking branch 'origin/develop' into develop