Cleanup and renaming of some navigation service classes

- Add tso parameter to restriction requests