Fixes for the system test script rename of the previous commits.
Authored by: bugman 2008-11-12
Parent: [r7978]
Child: [r7980]