#41: fixed module/file names