#312: fixed naming