relay: rename classes to better match functon