TW-11912
Applied new naming