Rename funs to one-to
Resolve conflicts by using one-to for procedure name