Fix variable naming to be consistent with other module