#944 - Fix package names for Secure Payments and fix ORM file names to conform to new 3.1 payment naming standard