rename trust/authorize; unify permissions; cleanup