Replace fn notation with current function name

Closes #45