Changed name for js used by our lists
Resolved merge-conflict