more appropriate naming of modules