Fix host inconsistency

fix host/handler naming