Rename jjb-verify and jjb-merge files