Unify UI prefix and naming - Update #31