Use new variable names from shell-includes