move back to pre-1.0 package names, for serialized form compatibility