name and module fixes