Updated names in SCIRun namespace to avoid confusion.