move to simpler names