Remove api namespace from users and sessions helpers
Merge with master