26 files changed, 222 insertions, 222 deletions
diff --git a/core/src/main/jdk1.1/java/security/cert/CertUtil.java b/core/src/main/jdk1.1/java/security/cert/CertUtil.java
index c390efa9..216a8d8e 100644
--- a/core/src/main/jdk1.1/java/security/cert/CertUtil.java
+++ b/core/src/main/jdk1.1/java/security/cert/CertUtil.java
@@ -7,13 +7,13 @@ import java.security.NoSuchProviderException;
 import java.security.Provider;
 import java.security.Security;
 
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.OIDTokenizer;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.util.Strings;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.OIDTokenizer;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.util.Strings;
 
 class CertUtil
 {
@@ -287,7 +287,7 @@ class CertUtil
      * Throw an IOException if the first component is not 0, 1 or 2 or the
      * second component is greater than 39.<br />
      * <br />
-     * User {@link org.bouncycastle.asn1.OIDTokenizer OIDTokenizer}
+     * User {@link org.spongycastle.asn1.OIDTokenizer OIDTokenizer}
      * 
      * @param the
      *            OID to be checked.
diff --git a/core/src/main/jdk1.1/java/security/cert/PolicyQualifierInfo.java b/core/src/main/jdk1.1/java/security/cert/PolicyQualifierInfo.java
index 5073669e..a17f49bf 100644
--- a/core/src/main/jdk1.1/java/security/cert/PolicyQualifierInfo.java
+++ b/core/src/main/jdk1.1/java/security/cert/PolicyQualifierInfo.java
@@ -4,12 +4,12 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.util.ASN1Dump;
 
 /**
  * An immutable policy qualifier represented by the ASN.1 PolicyQualifierInfo
@@ -63,11 +63,11 @@ import org.bouncycastle.asn1.util.ASN1Dump;
  * allows them to be passed around to various pieces of code without worrying
  * about coordinating access.<br />
  * <br />
- * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
- * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
- * {@link org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
- * {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream},
- * {@link org.bouncycastle.asn1.ASN1Object ASN1Object}
+ * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+ * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+ * {@link org.spongycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
+ * {@link org.spongycastle.asn1.DEROutputStream DEROutputStream},
+ * {@link org.spongycastle.asn1.ASN1Object ASN1Object}
  */
 public final class PolicyQualifierInfo
 {
@@ -81,10 +81,10 @@ public final class PolicyQualifierInfo
      * Creates an instance of <code>PolicyQualifierInfo</code> from the
      * encoded bytes. The encoded byte array is copied on construction.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
-     * {@link org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier} and
-     * {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+     * {@link org.spongycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier} and
+     * {@link org.spongycastle.asn1.DEROutputStream DEROutputStream}
      * 
      * @param encoded
      *            a byte array containing the qualifier in DER encoding
@@ -165,8 +165,8 @@ public final class PolicyQualifierInfo
      * Return a printable representation of this
      * <code>PolicyQualifierInfo</code>.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object}
      * 
      * @return a <code>String</code> describing the contents of this
      *         <code>PolicyQualifierInfo</code>
diff --git a/core/src/main/jdk1.1/java/security/cert/TrustAnchor.java b/core/src/main/jdk1.1/java/security/cert/TrustAnchor.java
index 23ced2f7..f139a742 100644
--- a/core/src/main/jdk1.1/java/security/cert/TrustAnchor.java
+++ b/core/src/main/jdk1.1/java/security/cert/TrustAnchor.java
@@ -5,9 +5,9 @@ import java.io.IOException;
 import java.security.PublicKey;
 import java.security.cert.X509Certificate;
 
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1Sequence;
 
 /**
  * A trust anchor or most-trusted Certification Authority (CA). <br />
diff --git a/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java b/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
index 5917765c..8d4ed9c4 100644
--- a/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
+++ b/core/src/main/jdk1.1/java/security/cert/X509CRLSelector.java
@@ -12,14 +12,14 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
 
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.PrincipalUtil;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1Integer;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.PrincipalUtil;
 
 /**
  * A <code>CRLSelector</code> that selects <code>X509CRLs</code> that match
@@ -47,12 +47,12 @@ import org.bouncycastle.jce.PrincipalUtil;
  * locking. Multiple threads each manipulating separate objects need not
  * synchronize.<br />
  * <br />
- * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
- * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
- * {@link org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
- * {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream},
- * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
- * {@link org.bouncycastle.asn1.x509.X509Name X509Name}
+ * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+ * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+ * {@link org.spongycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
+ * {@link org.spongycastle.asn1.DEROutputStream DEROutputStream},
+ * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+ * {@link org.spongycastle.asn1.x509.X509Name X509Name}
  * 
  * @see CRLSelector
  * @see X509CRL
@@ -184,7 +184,7 @@ public class X509CRLSelector implements CRLSelector
      * any previous value for the issuerNames criterion. If the specified name
      * is a duplicate, it may be ignored.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for parsing the
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for parsing the
      * name
      * 
      * @param name
@@ -233,10 +233,10 @@ public class X509CRLSelector implements CRLSelector
      * Note that the byte array supplied here is cloned to protect against
      * subsequent modifications.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for parsing the
-     * name, {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object} and
-     * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence}
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for parsing the
+     * name, {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object} and
+     * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence}
      * 
      * @param name
      *            a byte array containing the name in ASN.1 DER encoded form
@@ -457,7 +457,7 @@ public class X509CRLSelector implements CRLSelector
      * Returns a printable representation of the <code>X509CRLSelector</code>.<br />
      * <br />
      * Uses
-     * {@link org.bouncycastle.asn1.x509.X509Name#toString X509Name.toString} to
+     * {@link org.spongycastle.asn1.x509.X509Name#toString X509Name.toString} to
      * format the output
      * 
      * @return a <code>String</code> describing the contents of the
@@ -500,9 +500,9 @@ public class X509CRLSelector implements CRLSelector
      * Decides whether a <code>CRL</code> should be selected.<br />
      * <br />
      * Uses
-     * {@link org.bouncycastle.asn1.x509.X509Name#toString X509Name.toString} to
+     * {@link org.spongycastle.asn1.x509.X509Name#toString X509Name.toString} to
      * parse and to compare the crl parameter issuer and
-     * {@link org.bouncycastle.asn1.x509.X509Extensions#CRLNumber CRLNumber} to
+     * {@link org.spongycastle.asn1.x509.X509Extensions#CRLNumber CRLNumber} to
      * access the CRL number extension.
      * 
      * @param crl
diff --git a/core/src/main/jdk1.1/java/security/cert/X509CertSelector.java b/core/src/main/jdk1.1/java/security/cert/X509CertSelector.java
index 0ac127f6..9292c2e3 100644
--- a/core/src/main/jdk1.1/java/security/cert/X509CertSelector.java
+++ b/core/src/main/jdk1.1/java/security/cert/X509CertSelector.java
@@ -20,24 +20,24 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.asn1.ASN1InputStream;
+import org.spongycastle.asn1.ASN1Object;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.ASN1OctetString;
+import org.spongycastle.asn1.ASN1Sequence;
+import org.spongycastle.asn1.ASN1TaggedObject;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.DERGeneralizedTime;
+import org.spongycastle.asn1.DEROutputStream;
+import org.spongycastle.asn1.util.ASN1Dump;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.ExtendedKeyUsage;
+import org.spongycastle.asn1.x509.KeyPurposeId;
+import org.spongycastle.asn1.x509.SubjectPublicKeyInfo;
+import org.spongycastle.asn1.x509.X509Extensions;
+import org.spongycastle.asn1.x509.X509Name;
+import org.spongycastle.jce.PrincipalUtil;
+import org.spongycastle.util.Integers;
 
 /**
  * A <code>CertSelector</code> that selects
@@ -76,18 +76,18 @@ import org.bouncycastle.util.Integers;
  * <b>TODO: implement name constraints</b>
  * <b>TODO: implement match check for path to names</b><br />
  * <br />
- * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
- * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
- * {@link org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
- * {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream},
- * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
- * {@link org.bouncycastle.asn1.OIDTokenizer OIDTokenizer},
- * {@link org.bouncycastle.asn1.x509.X509Name X509Name},
- * {@link org.bouncycastle.asn1.x509.X509Extensions X509Extensions},
- * {@link org.bouncycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage},
- * {@link org.bouncycastle.asn1.x509.KeyPurposeId KeyPurposeId},
- * {@link org.bouncycastle.asn1.x509.SubjectPublicKeyInfo SubjectPublicKeyInfo},
- * {@link org.bouncycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier}
+ * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+ * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+ * {@link org.spongycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
+ * {@link org.spongycastle.asn1.DEROutputStream DEROutputStream},
+ * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+ * {@link org.spongycastle.asn1.OIDTokenizer OIDTokenizer},
+ * {@link org.spongycastle.asn1.x509.X509Name X509Name},
+ * {@link org.spongycastle.asn1.x509.X509Extensions X509Extensions},
+ * {@link org.spongycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage},
+ * {@link org.spongycastle.asn1.x509.KeyPurposeId KeyPurposeId},
+ * {@link org.spongycastle.asn1.x509.SubjectPublicKeyInfo SubjectPublicKeyInfo},
+ * {@link org.spongycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier}
  */
 public class X509CertSelector implements CertSelector
 {
@@ -210,7 +210,7 @@ public class X509CertSelector implements CertSelector
      * If <code>issuerDN</code> is not <code>null</code>, it should contain
      * a distinguished name, in RFC 2253 format.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for parsing the
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for parsing the
      * issuerDN.
      * 
      * @param issuerDN
@@ -283,10 +283,10 @@ public class X509CertSelector implements CertSelector
      * Note that the byte array specified here is cloned to protect against
      * subsequent modifications.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
-     * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
-     * {@link org.bouncycastle.asn1.x509.X509Name X509Name}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+     * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+     * {@link org.spongycastle.asn1.x509.X509Name X509Name}
      * 
      * @param issuerDN -
      *            a byte array containing the distinguished name in ASN.1 DER
@@ -327,7 +327,7 @@ public class X509CertSelector implements CertSelector
      * If <code>subjectDN</code> is not <code>null</code>, it should
      * contain a distinguished name, in RFC 2253 format.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for parsing the
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for parsing the
      * subjectDN.
      * 
      * @param subjectDN
@@ -370,10 +370,10 @@ public class X509CertSelector implements CertSelector
      * the ASN.1 notation for this structure, see
      * {@link #setIssuer(byte []) setIssuer(byte [] issuerDN)}.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
-     * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
-     * {@link org.bouncycastle.asn1.x509.X509Name X509Name}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+     * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+     * {@link org.spongycastle.asn1.x509.X509Name X509Name}
      * 
      * @param subjectDN
      *            a byte array containing the distinguished name in ASN.1 DER
@@ -709,7 +709,7 @@ public class X509CertSelector implements CertSelector
      * <br />
      * Note that the Set is cloned to protect against subsequent modifications.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.KeyPurposeId KeyPurposeId}
+     * Uses {@link org.spongycastle.asn1.x509.KeyPurposeId KeyPurposeId}
      * 
      * @param keyPurposeSet
      *            a <code>Set</code> of key purpose OIDs in string format (or
@@ -1322,7 +1322,7 @@ public class X509CertSelector implements CertSelector
      * If the value returned is not <code>null</code>, it is a distinguished
      * name, in RFC 2253 format.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for formatiing
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for formatiing
      * byte[] issuerDN to String.
      * 
      * @return the required issuer distinguished name in RFC 2253 format (or
@@ -1356,8 +1356,8 @@ public class X509CertSelector implements CertSelector
      * Note that the byte array returned is cloned to protect against subsequent
      * modifications.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream},
-     * {@link org.bouncycastle.asn1.x509.X509Name X509Name} to gnerate byte[]
+     * Uses {@link org.spongycastle.asn1.DEROutputStream DEROutputStream},
+     * {@link org.spongycastle.asn1.x509.X509Name X509Name} to gnerate byte[]
      * output for String issuerDN.
      * 
      * @return a byte array containing the required issuer distinguished name in
@@ -1395,7 +1395,7 @@ public class X509CertSelector implements CertSelector
      * If the value returned is not <code>null</code>, it is a distinguished
      * name, in RFC 2253 format.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.x509.X509Name X509Name} for formatiing
+     * Uses {@link org.spongycastle.asn1.x509.X509Name X509Name} for formatiing
      * byte[] subjectDN to String.
      * 
      * @return the required subject distinguished name in RFC 2253 format (or
@@ -1429,8 +1429,8 @@ public class X509CertSelector implements CertSelector
      * Note that the byte array returned is cloned to protect against subsequent
      * modifications.<br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.DEROutputStream DEROutputStream},
-     * {@link org.bouncycastle.asn1.x509.X509Name X509Name} to gnerate byte[]
+     * Uses {@link org.spongycastle.asn1.DEROutputStream DEROutputStream},
+     * {@link org.spongycastle.asn1.x509.X509Name X509Name} to gnerate byte[]
      * output for String subjectDN.
      * 
      * @return a byte array containing the required subject distinguished name
@@ -1861,9 +1861,9 @@ public class X509CertSelector implements CertSelector
      * <b>TODO: implement output for currently unsupported options(name
      * constraints)</b><br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
-     * {@link org.bouncycastle.asn1.x509.KeyPurposeId KeyPurposeId}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+     * {@link org.spongycastle.asn1.x509.KeyPurposeId KeyPurposeId}
      * 
      * @return a <code>String</code> describing the contents of the
      *         <code>CertSelector</code>
@@ -2004,17 +2004,17 @@ public class X509CertSelector implements CertSelector
      * <br />
      * <b>TODO: implement missing tests (name constraints and path to names)</b><br />
      * <br />
-     * Uses {@link org.bouncycastle.asn1.ASN1InputStream ASN1InputStream},
-     * {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence},
-     * {@link org.bouncycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
-     * {@link org.bouncycastle.asn1.ASN1Object ASN1Object},
-     * {@link org.bouncycastle.asn1.DERGeneralizedTime DERGeneralizedTime},
-     * {@link org.bouncycastle.asn1.x509.X509Name X509Name},
-     * {@link org.bouncycastle.asn1.x509.X509Extensions X509Extensions},
-     * {@link org.bouncycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage},
-     * {@link org.bouncycastle.asn1.x509.KeyPurposeId KeyPurposeId},
-     * {@link org.bouncycastle.asn1.x509.SubjectPublicKeyInfo SubjectPublicKeyInfo},
-     * {@link org.bouncycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier}
+     * Uses {@link org.spongycastle.asn1.ASN1InputStream ASN1InputStream},
+     * {@link org.spongycastle.asn1.ASN1Sequence ASN1Sequence},
+     * {@link org.spongycastle.asn1.ASN1ObjectIdentifier ASN1ObjectIdentifier},
+     * {@link org.spongycastle.asn1.ASN1Object ASN1Object},
+     * {@link org.spongycastle.asn1.DERGeneralizedTime DERGeneralizedTime},
+     * {@link org.spongycastle.asn1.x509.X509Name X509Name},
+     * {@link org.spongycastle.asn1.x509.X509Extensions X509Extensions},
+     * {@link org.spongycastle.asn1.x509.ExtendedKeyUsage ExtendedKeyUsage},
+     * {@link org.spongycastle.asn1.x509.KeyPurposeId KeyPurposeId},
+     * {@link org.spongycastle.asn1.x509.SubjectPublicKeyInfo SubjectPublicKeyInfo},
+     * {@link org.spongycastle.asn1.x509.AlgorithmIdentifier AlgorithmIdentifier}
      * to access X509 extensions
      * 
      * @param cert
diff --git a/core/src/main/jdk1.1/org/bouncycastle/asn1/ASN1InputStream.java b/core/src/main/jdk1.1/org/spongycastle/asn1/ASN1InputStream.java
index 7c156266..8c6571de 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/asn1/ASN1InputStream.java
+++ b/core/src/main/jdk1.1/org/spongycastle/asn1/ASN1InputStream.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1;
+package org.spongycastle.asn1;
 
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
@@ -6,7 +6,7 @@ import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.bouncycastle.util.io.Streams;
+import org.spongycastle.util.io.Streams;
 
 /**
  * a general purpose ASN.1 decoder - note: this class differs from the
diff --git a/core/src/main/jdk1.1/org/bouncycastle/asn1/ASN1StreamParser.java b/core/src/main/jdk1.1/org/spongycastle/asn1/ASN1StreamParser.java
index 8ef5f3e6..bbaef056 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/asn1/ASN1StreamParser.java
+++ b/core/src/main/jdk1.1/org/spongycastle/asn1/ASN1StreamParser.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.asn1;
+package org.spongycastle.asn1;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/core/src/main/jdk1.1/org/bouncycastle/asn1/DERApplicationSpecific.java b/core/src/main/jdk1.1/org/spongycastle/asn1/DERApplicationSpecific.java
index 2726d6e9..30c66ab6 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/asn1/DERApplicationSpecific.java
+++ b/core/src/main/jdk1.1/org/spongycastle/asn1/DERApplicationSpecific.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.asn1;
+package org.spongycastle.asn1;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.util.Arrays;
 
 /**
  * Base class for an application specific object
@@ -201,7 +201,7 @@ public class DERApplicationSpecific
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.asn1.ASN1Primitive#encode(org.bouncycastle.asn1.DEROutputStream)
+     * @see org.spongycastle.asn1.ASN1Primitive#encode(org.spongycastle.asn1.DEROutputStream)
      */
     void encode(ASN1OutputStream out) throws IOException
     {
diff --git a/core/src/main/jdk1.1/org/bouncycastle/asn1/x500/style/BCStyle.java b/core/src/main/jdk1.1/org/spongycastle/asn1/x500/style/BCStyle.java
index 15e3c2a7..2591e4cd 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/asn1/x500/style/BCStyle.java
+++ b/core/src/main/jdk1.1/org/spongycastle/asn1/x500/style/BCStyle.java
@@ -1,21 +1,21 @@
-package org.bouncycastle.asn1.x500.style;
+package org.spongycastle.asn1.x500.style;
 
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.AttributeTypeAndValue;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameStyle;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1GeneralizedTime;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.x500.AttributeTypeAndValue;
+import org.spongycastle.asn1.x500.RDN;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.X500NameStyle;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
 
 public class BCStyle
     implements X500NameStyle
diff --git a/core/src/main/jdk1.1/org/bouncycastle/asn1/x500/style/RFC4519Style.java b/core/src/main/jdk1.1/org/spongycastle/asn1/x500/style/RFC4519Style.java
index e5ff6a11..0fd11785 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/asn1/x500/style/RFC4519Style.java
+++ b/core/src/main/jdk1.1/org/spongycastle/asn1/x500/style/RFC4519Style.java
@@ -1,18 +1,18 @@
-package org.bouncycastle.asn1.x500.style;
+package org.spongycastle.asn1.x500.style;
 
 import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Hashtable;
 
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.AttributeTypeAndValue;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameStyle;
+import org.spongycastle.asn1.ASN1Encodable;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERIA5String;
+import org.spongycastle.asn1.DERPrintableString;
+import org.spongycastle.asn1.DERUTF8String;
+import org.spongycastle.asn1.x500.AttributeTypeAndValue;
+import org.spongycastle.asn1.x500.RDN;
+import org.spongycastle.asn1.x500.X500Name;
+import org.spongycastle.asn1.x500.X500NameStyle;
 
 public class RFC4519Style
     implements X500NameStyle
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java b/core/src/main/jdk1.1/org/spongycastle/crypto/agreement/jpake/JPAKEParticipant.java
index 30808802..17554b96 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/agreement/jpake/JPAKEParticipant.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.agreement.jpake;
+package org.spongycastle.crypto.agreement.jpake;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
 
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.digests.SHA256Digest;
+import org.spongycastle.util.Arrays;
 
 /**
  * A participant in a Password Authenticated Key Exchange by Juggling (J-PAKE) exchange.
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java b/core/src/main/jdk1.1/org/spongycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
index 5a2f4022..59e93385 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.agreement.jpake;
+package org.spongycastle.crypto.agreement.jpake;
 
 import java.math.BigInteger;
 
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/digests/SkeinEngine.java b/core/src/main/jdk1.1/org/spongycastle/crypto/digests/SkeinEngine.java
index 5bfee7e6..a278ff4e 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/digests/SkeinEngine.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/digests/SkeinEngine.java
@@ -1,15 +1,15 @@
-package org.bouncycastle.crypto.digests;
+package org.spongycastle.crypto.digests;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.crypto.params.SkeinParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.engines.ThreefishEngine;
+import org.spongycastle.crypto.macs.SkeinMac;
+import org.spongycastle.crypto.params.SkeinParameters;
+import org.spongycastle.util.Arrays;
+import org.spongycastle.util.Memoable;
 
 /**
  * Implementation of the Skein family of parameterised hash functions in 256, 512 and 1024 bit block
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/encodings/PKCS1Encoding.java b/core/src/main/jdk1.1/org/spongycastle/crypto/encodings/PKCS1Encoding.java
index 76051c3f..7af31f36 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/encodings/PKCS1Encoding.java
@@ -1,12 +1,12 @@
-package org.bouncycastle.crypto.encodings;
+package org.spongycastle.crypto.encodings;
 
 import java.security.SecureRandom;
 
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.InvalidCipherTextException;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ParametersWithRandom;
 
 /**
  * this does your basic PKCS 1 v1.5 padding - whether or not you should be using this
@@ -17,13 +17,13 @@ public class PKCS1Encoding
 {
     /**
      * some providers fail to include the leading zero in PKCS1 encoded blocks. If you need to
-     * work with one of these set the system property org.bouncycastle.pkcs1.strict to false.
+     * work with one of these set the system property org.spongycastle.pkcs1.strict to false.
      * <p>
      * The system property is checked during construction of the encoding object, it is set to 
      * true by default.
      * </p>
      */
-    public static final String STRICT_LENGTH_ENABLED_PROPERTY = "org.bouncycastle.pkcs1.strict";
+    public static final String STRICT_LENGTH_ENABLED_PROPERTY = "org.spongycastle.pkcs1.strict";
     
     private static final int HEADER_LENGTH = 10;
 
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/engines/NullEngine.java b/core/src/main/jdk1.1/org/spongycastle/crypto/engines/NullEngine.java
index b5c74512..21927272 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/engines/NullEngine.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/engines/NullEngine.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.crypto.engines;
+package org.spongycastle.crypto.engines;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.OutputLengthException;
 
 /**
  * The no-op engine that just copies bytes through, irrespective of whether encrypting and decrypting.
@@ -34,7 +34,7 @@ public class NullEngine implements BlockCipher
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#init(boolean, org.bouncycastle.crypto.CipherParameters)
+     * @see org.spongycastle.crypto.BlockCipher#init(boolean, org.spongycastle.crypto.CipherParameters)
      */
     public void init(boolean forEncryption, CipherParameters params) throws IllegalArgumentException
     {
@@ -43,7 +43,7 @@ public class NullEngine implements BlockCipher
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#getAlgorithmName()
+     * @see org.spongycastle.crypto.BlockCipher#getAlgorithmName()
      */
     public String getAlgorithmName()
     {
@@ -51,7 +51,7 @@ public class NullEngine implements BlockCipher
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#getBlockSize()
+     * @see org.spongycastle.crypto.BlockCipher#getBlockSize()
      */
     public int getBlockSize()
     {
@@ -59,7 +59,7 @@ public class NullEngine implements BlockCipher
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#processBlock(byte[], int, byte[], int)
+     * @see org.spongycastle.crypto.BlockCipher#processBlock(byte[], int, byte[], int)
      */
     public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
         throws DataLengthException, IllegalStateException
@@ -87,7 +87,7 @@ public class NullEngine implements BlockCipher
     }
 
     /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#reset()
+     * @see org.spongycastle.crypto.BlockCipher#reset()
      */
     public void reset()
     {
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/params/DSAParameterGenerationParameters.java b/core/src/main/jdk1.1/org/spongycastle/crypto/params/DSAParameterGenerationParameters.java
index 3cbe9182..2b57f23c 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/params/DSAParameterGenerationParameters.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/params/DSAParameterGenerationParameters.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.params;
+package org.spongycastle.crypto.params;
 
 import java.security.SecureRandom;
 
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/params/HKDFParameters.java b/core/src/main/jdk1.1/org/spongycastle/crypto/params/HKDFParameters.java
index 0f41955a..4b125a7c 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/params/HKDFParameters.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/params/HKDFParameters.java
@@ -1,7 +1,7 @@
-package org.bouncycastle.crypto.params;
+package org.spongycastle.crypto.params;
 
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.crypto.DerivationParameters;
+import org.spongycastle.util.Arrays;
 
 /**
  * Parameter class for the HKDFBytesGenerator class.
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/prng/BasicEntropySourceProvider.java b/core/src/main/jdk1.1/org/spongycastle/crypto/prng/BasicEntropySourceProvider.java
index ded87a71..31c85036 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/prng/BasicEntropySourceProvider.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/prng/BasicEntropySourceProvider.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.prng;
+package org.spongycastle.crypto.prng;
 
 import java.security.SecureRandom;
 
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/prng/SP800SecureRandomBuilder.java b/core/src/main/jdk1.1/org/spongycastle/crypto/prng/SP800SecureRandomBuilder.java
index 666a8541..e682f687 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/prng/SP800SecureRandomBuilder.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/prng/SP800SecureRandomBuilder.java
@@ -1,16 +1,16 @@
-package org.bouncycastle.crypto.prng;
+package org.spongycastle.crypto.prng;
 
 import java.security.SecureRandom;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.prng.drbg.CTRSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.DualECPoints;
-import org.bouncycastle.crypto.prng.drbg.DualECSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.HMacSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.HashSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
+import org.spongycastle.crypto.BlockCipher;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.Mac;
+import org.spongycastle.crypto.prng.drbg.CTRSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.DualECPoints;
+import org.spongycastle.crypto.prng.drbg.DualECSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.HMacSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.HashSP800DRBG;
+import org.spongycastle.crypto.prng.drbg.SP80090DRBG;
 
 /**
  * Builder class for making SecureRandom objects based on SP 800-90A Deterministic Random Bit Generators (DRBG).
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/signers/RSADigestSigner.java b/core/src/main/jdk1.1/org/spongycastle/crypto/signers/RSADigestSigner.java
index f15e4047..e6a99d89 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/signers/RSADigestSigner.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/signers/RSADigestSigner.java
@@ -1,28 +1,28 @@
-package org.bouncycastle.crypto.signers;
+package org.spongycastle.crypto.signers;
 
 import java.io.IOException;
 import java.util.Hashtable;
 
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
+import org.spongycastle.asn1.ASN1Encoding;
+import org.spongycastle.asn1.ASN1ObjectIdentifier;
+import org.spongycastle.asn1.DERNull;
+import org.spongycastle.asn1.nist.NISTObjectIdentifiers;
+import org.spongycastle.asn1.pkcs.PKCSObjectIdentifiers;
+import org.spongycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+import org.spongycastle.asn1.x509.AlgorithmIdentifier;
+import org.spongycastle.asn1.x509.DigestInfo;
+import org.spongycastle.asn1.x509.X509ObjectIdentifiers;
+import org.spongycastle.crypto.AsymmetricBlockCipher;
+import org.spongycastle.crypto.CipherParameters;
+import org.spongycastle.crypto.CryptoException;
+import org.spongycastle.crypto.DataLengthException;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.crypto.Signer;
+import org.spongycastle.crypto.encodings.PKCS1Encoding;
+import org.spongycastle.crypto.engines.RSABlindedEngine;
+import org.spongycastle.crypto.params.AsymmetricKeyParameter;
+import org.spongycastle.crypto.params.ParametersWithRandom;
+import org.spongycastle.util.Arrays;
 
 public class RSADigestSigner
     implements Signer
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/AbstractTlsContext.java b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/AbstractTlsContext.java
index b8153b06..cd6f7a8c 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/AbstractTlsContext.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/AbstractTlsContext.java
@@ -1,10 +1,10 @@
-package org.bouncycastle.crypto.tls;
+package org.spongycastle.crypto.tls;
 
 import java.security.SecureRandom;
 
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.crypto.prng.RandomGenerator;
-import org.bouncycastle.util.Times;
+import org.spongycastle.crypto.prng.DigestRandomGenerator;
+import org.spongycastle.crypto.prng.RandomGenerator;
+import org.spongycastle.util.Times;
 
 abstract class AbstractTlsContext
     implements TlsContext
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/DTLSReassembler.java b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/DTLSReassembler.java
index 2d3cf267..baf9c92f 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/DTLSReassembler.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/DTLSReassembler.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls;
+package org.spongycastle.crypto.tls;
 
 import java.util.Vector;
 
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/DTLSReliableHandshake.java b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/DTLSReliableHandshake.java
index af694ac9..1a991161 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/DTLSReliableHandshake.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/DTLSReliableHandshake.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls;
+package org.spongycastle.crypto.tls;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -6,8 +6,8 @@ import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Vector;
 
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Integers;
+import org.spongycastle.crypto.Digest;
+import org.spongycastle.util.Integers;
 
 class DTLSReliableHandshake
 {
diff --git a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/UDPTransport.java b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/UDPTransport.java
index f6c96b92..913c1e55 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/crypto/tls/UDPTransport.java
+++ b/core/src/main/jdk1.1/org/spongycastle/crypto/tls/UDPTransport.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.crypto.tls;
+package org.spongycastle.crypto.tls;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/core/src/main/jdk1.1/org/bouncycastle/i18n/LocalizedMessage.java b/core/src/main/jdk1.1/org/spongycastle/i18n/LocalizedMessage.java
index c1c4c58a..1eab110c 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/i18n/LocalizedMessage.java
+++ b/core/src/main/jdk1.1/org/spongycastle/i18n/LocalizedMessage.java
@@ -1,9 +1,9 @@
-package org.bouncycastle.i18n;
+package org.spongycastle.i18n;
 
-import org.bouncycastle.i18n.filter.Filter;
-import org.bouncycastle.i18n.filter.TrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedUrlInput;
+import org.spongycastle.i18n.filter.Filter;
+import org.spongycastle.i18n.filter.TrustedInput;
+import org.spongycastle.i18n.filter.UntrustedInput;
+import org.spongycastle.i18n.filter.UntrustedUrlInput;
 
 import java.io.UnsupportedEncodingException;
 import java.text.DateFormat;
diff --git a/core/src/main/jdk1.1/org/bouncycastle/i18n/MissingEntryException.java b/core/src/main/jdk1.1/org/spongycastle/i18n/MissingEntryException.java
index 1400338f..d876a91a 100644
--- a/core/src/main/jdk1.1/org/bouncycastle/i18n/MissingEntryException.java
+++ b/core/src/main/jdk1.1/org/spongycastle/i18n/MissingEntryException.java
@@ -1,4 +1,4 @@
-package org.bouncycastle.i18n;
+package org.spongycastle.i18n;
 
 import java.net.URL;
 import java.util.Locale;