Switch to simpler names.