Updated some variable names for my custom shell helpers.