Issues/47 naming