Renamed msg-fn to name-fn.