More rename goodness from davidsky