PIM-1544 : Rename and move processors