Remove - from fn names
Remove - from fn names
Merge branch 'master' into edge