Rename to arcs with an s

[ticket: X]