renamed path variable, with urlpath where applicable