Change property names to be consistent with RSA