Change some names to less confusing ones

TBR: @terrylucas