Fix redirection, plus some minor tidying up of names
Authored by: bsdimp 2010-12-01
Parent: [r5643]
Child: [r5645]