Tweaked some bash variable names