diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
index eb54d6d191..461e52eb04 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/BaseDigestPasswordEncoder.java
@@ -35,7 +35,7 @@ public abstract class BaseDigestPasswordEncoder implements PasswordEncoder {
      * the hash bytes. Setting this property to true will cause the encoded
      * pass to be returned as Base64 text, which will consume 24 characters.
      *
-     * @param encodeHashAsBase64 DOCUMENT ME!
+     * @param encodeHashAsBase64 set to true for Base64 output
      */
     public void setEncodeHashAsBase64(boolean encodeHashAsBase64) {
         this.encodeHashAsBase64 = encodeHashAsBase64;
diff --git a/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java b/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
index f07617aa86..28eb8ca903 100644
--- a/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
+++ b/core/src/main/java/org/acegisecurity/providers/encoding/PasswordEncoder.java
@@ -49,14 +49,14 @@ public interface PasswordEncoder {
      * @param encPass a pre-encoded password
      * @param rawPass a raw password to encode and compare against the
      *        pre-encoded password
-     * @param saltSource optionally used by the implementation to 'salt' the
+     * @param salt optionally used by the implementation to 'salt' the
      *        raw password before encoding. A <code>null</code> value is
      *        legal.
      *
      * @return DOCUMENT ME!
      */
     public boolean isPasswordValid(String encPass, String rawPass,
-        Object saltSource) throws DataAccessException;
+        Object salt) throws DataAccessException;
 
     /**
      * <p>
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/MD5PasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/dao/MD5PasswordEncoderTest.java
rename to core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java
index ef2d0d1c07..9633c3d4d0 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/MD5PasswordEncoderTest.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/Md5PasswordEncoderTest.java
@@ -13,13 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package net.sf.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.encoding.*;
-
-
 /**
  * <p>
  * TestCase for PlaintextPasswordEncoder.
@@ -28,7 +25,7 @@ import net.sf.acegisecurity.providers.encoding.*;
  * @author colin sampaleanu
  * @version $Id$
  */
-public class MD5PasswordEncoderTest extends TestCase {
+public class Md5PasswordEncoderTest extends TestCase {
     //~ Methods ================================================================
 
     public void testBasicFunctionality() {
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/PlaintextPasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java
similarity index 95%
rename from core/src/test/java/org/acegisecurity/providers/dao/PlaintextPasswordEncoderTest.java
rename to core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java
index d4935312d4..47e6b9ae80 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/PlaintextPasswordEncoderTest.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/PlaintextPasswordEncoderTest.java
@@ -13,13 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package net.sf.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.encoding.*;
-
-
 /**
  * <p>
  * TestCase for PlaintextPasswordEncoder.
diff --git a/core/src/test/java/org/acegisecurity/providers/dao/SHAPasswordEncoderTest.java b/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java
similarity index 91%
rename from core/src/test/java/org/acegisecurity/providers/dao/SHAPasswordEncoderTest.java
rename to core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java
index bd6ca30354..94007af18c 100644
--- a/core/src/test/java/org/acegisecurity/providers/dao/SHAPasswordEncoderTest.java
+++ b/core/src/test/java/org/acegisecurity/providers/encoding/ShaPasswordEncoderTest.java
@@ -13,12 +13,10 @@
  * limitations under the License.
  */
 
-package net.sf.acegisecurity.providers.dao;
+package net.sf.acegisecurity.providers.encoding;
 
 import junit.framework.TestCase;
 
-import net.sf.acegisecurity.providers.encoding.*;
-
 
 /**
  * <p>
@@ -28,7 +26,7 @@ import net.sf.acegisecurity.providers.encoding.*;
  * @author colin sampaleanu
  * @version $Id$
  */
-public class SHAPasswordEncoderTest extends TestCase {
+public class ShaPasswordEncoderTest extends TestCase {
     //~ Methods ================================================================
 
     public void testBasicFunctionality() {
diff --git a/test/acegisecuritytest.properties b/test/acegisecuritytest.properties
index 87a3e7d5a6..4a24668df3 100644
--- a/test/acegisecuritytest.properties
+++ b/test/acegisecuritytest.properties
@@ -1,5 +1,5 @@
 #HSQL database
-#Thu Apr 15 23:43:47 EDT 2004
+#Fri Apr 16 07:51:49 EDT 2004
 sql.strict_fk=true
 readonly=false
 sql.strong_fk=true