diff --git a/server/src/main/java/org/opencps/pki/PdfSigner.java b/server/src/main/java/org/opencps/pki/PdfSigner.java
index 74da16c..3783b7f 100644
--- a/server/src/main/java/org/opencps/pki/PdfSigner.java
+++ b/server/src/main/java/org/opencps/pki/PdfSigner.java
@@ -189,7 +189,7 @@ public Boolean sign(byte[] signature) throws SignatureException {
      */
     @Override
     public Boolean sign(byte[] signature, String filePath) throws SignatureException {
-        ExternalSignatureContainer container = new ClientSignatureContainer(this, signature);
+        ExternalSignatureContainer container = new Pkcs7GenerateSignatureContainer(this, signature);
         return signExternal(container, filePath);
     }
 
diff --git a/server/src/main/java/org/opencps/pki/ClientSignatureContainer.java b/server/src/main/java/org/opencps/pki/Pkcs7GenerateSignatureContainer.java
similarity index 95%
rename from server/src/main/java/org/opencps/pki/ClientSignatureContainer.java
rename to server/src/main/java/org/opencps/pki/Pkcs7GenerateSignatureContainer.java
index fbd32b4..3823b35 100644
--- a/server/src/main/java/org/opencps/pki/ClientSignatureContainer.java
+++ b/server/src/main/java/org/opencps/pki/Pkcs7GenerateSignatureContainer.java
@@ -41,7 +41,7 @@
  * 
  * @author Nguyen Van Nguyen <nguyennv@iwayvietnam.com>
  */
-public class ClientSignatureContainer implements ExternalSignatureContainer {
+public class Pkcs7GenerateSignatureContainer implements ExternalSignatureContainer {
 
     private byte[] signature;
     
@@ -50,7 +50,7 @@ public class ClientSignatureContainer implements ExternalSignatureContainer {
     /**
      * Constructor
      */
-    public ClientSignatureContainer(PdfSigner signer, byte[] signature) {
+    public Pkcs7GenerateSignatureContainer(PdfSigner signer, byte[] signature) {
         this.signer = signer;
         this.signature = signature;
     }
diff --git a/server/src/test/java/org/opencps/pki/ClientSignatureContainerTest.java b/server/src/test/java/org/opencps/pki/Pkcs7GenerateSignatureContainerTest.java
similarity index 91%
rename from server/src/test/java/org/opencps/pki/ClientSignatureContainerTest.java
rename to server/src/test/java/org/opencps/pki/Pkcs7GenerateSignatureContainerTest.java
index bc9357f..fb79438 100644
--- a/server/src/test/java/org/opencps/pki/ClientSignatureContainerTest.java
+++ b/server/src/test/java/org/opencps/pki/Pkcs7GenerateSignatureContainerTest.java
@@ -54,12 +54,12 @@
 /**
  * @author Nguyen Van Nguyen <nguyennv@iwayvietnam.com>
  */
-public class ClientSignatureContainerTest extends TestCase {
+public class Pkcs7GenerateSignatureContainerTest extends TestCase {
     private static final String certPath = "./src/test/java/resources/cert.pem";
     private static final String keyPath = "./src/test/java/resources/key.pem";
     private static final String pdfPath = "./src/test/java/resources/opencps.pdf";
 
-    public ClientSignatureContainerTest(String testName) {
+    public Pkcs7GenerateSignatureContainerTest(String testName) {
         super(testName);
     }
 
@@ -67,7 +67,7 @@ public ClientSignatureContainerTest(String testName) {
      * @return the suite of tests being tested
      */
     public static Test suite() {
-        return new TestSuite(ClientSignatureContainerTest.class);
+        return new TestSuite(Pkcs7GenerateSignatureContainerTest.class);
     }
     
     public void testSignatureContainer() throws GeneralSecurityException, IOException {
@@ -94,7 +94,7 @@ public void testSignatureContainer() throws GeneralSecurityException, IOExceptio
         @SuppressWarnings("resource")
 		InputStream rg = new RASInputStream(new RandomAccessSourceFactory().createRanged(readerSource, gaps));
 
-        ExternalSignatureContainer container = new ClientSignatureContainer(signer, extSignature);
+        ExternalSignatureContainer container = new Pkcs7GenerateSignatureContainer(signer, extSignature);
         assertTrue(container.sign(rg).length > 0);
     }
     
@@ -111,7 +111,7 @@ public void testSignatureContainerWithInvalidSignature() throws IOException, Sig
         pemReader.close();
         PrivateKeySignature signature = new PrivateKeySignature(privateKey, signer.getHashAlgorithm().toString(), "BC");
         byte[] extSignature = signature.sign(signer.computeHash());
-        ExternalSignatureContainer container = new ClientSignatureContainer(signer, extSignature);
+        ExternalSignatureContainer container = new Pkcs7GenerateSignatureContainer(signer, extSignature);
         try {
             container.sign(mock(InputStream.class));
             fail("Missing exception");
@@ -125,7 +125,7 @@ public void testSignatureContainerWithEmptySignature() throws CertificateExcepti
         CertificateFactory cf = CertificateFactory.getInstance("X.509");
         X509Certificate cert = (X509Certificate) cf.generateCertificate(new FileInputStream(new File(certPath)));
         PdfSigner signer = new PdfSigner(pdfPath, cert);
-        ExternalSignatureContainer container = new ClientSignatureContainer(signer, new byte[0]);
+        ExternalSignatureContainer container = new Pkcs7GenerateSignatureContainer(signer, new byte[0]);
         try {
             container.sign(mock(InputStream.class));
             fail("Missing exception");
diff --git a/server/src/test/java/org/opencps/pki/Pksc7SignatureContainerTest.java b/server/src/test/java/org/opencps/pki/Pksc7SignatureContainerTest.java
index f08fb9f..caaaf30 100644
--- a/server/src/test/java/org/opencps/pki/Pksc7SignatureContainerTest.java
+++ b/server/src/test/java/org/opencps/pki/Pksc7SignatureContainerTest.java
@@ -52,7 +52,7 @@ public Pksc7SignatureContainerTest(String testName) {
      * @return the suite of tests being tested
      */
     public static Test suite() {
-        return new TestSuite(ClientSignatureContainerTest.class);
+        return new TestSuite(Pkcs7GenerateSignatureContainerTest.class);
     }
     
     public void testSignatureContainer() throws FileNotFoundException, GeneralSecurityException {