Should we keep using the modulename instead of the filename?