Consistent use of variable for paths

We should use path consistently rather than path_info.