Replace hyphens in function names with underscores

Hyphens are not recommended for function names.
Replace hyphens in function names with underscores

Hyphens are not recommended for function names.