made naming of modules more consistent