tweaking naming structure