Jpk/naming conventions