fixed variable naming to 8.0 format