improved module naming, see #2