Misc. naming change.