Fix move to app-oriented endpoints