Fix CHT -> APP