JC-1508 Rename package.