renamed variables to remove deprecated warnings