Updated variable names to match dir patcher impl