cosmetics
convert hyphens into underscores in module names
avoid using numbers as function names, closes #4