Renamed path classes

Renamed path classes per review in PR 782.