Refs #6473. Fixed the Raw workspace names.

This naming is assumed in other places as it turns out.