More JP name fixes.