Tweak API urls/paths for clarity/consistency