Feature/#20 naming review