Unify UI prefix and namings - Update #31