Remove - from fn names