names of low-level modules always explicit in define
Merge pull request #662 from herby/names-in-define

names of low-level modules always explicit in define