diff --git a/signing-server/src/integration-test/kotlin/net/corda/signing/DemoMain.kt b/signing-server/src/integration-test/kotlin/com/r3/corda/signing/DemoMain.kt
similarity index 84%
rename from signing-server/src/integration-test/kotlin/net/corda/signing/DemoMain.kt
rename to signing-server/src/integration-test/kotlin/com/r3/corda/signing/DemoMain.kt
index 396dc20e25..ff6a122ecc 100644
--- a/signing-server/src/integration-test/kotlin/net/corda/signing/DemoMain.kt
+++ b/signing-server/src/integration-test/kotlin/com/r3/corda/signing/DemoMain.kt
@@ -1,10 +1,10 @@
-package net.corda.signing
+package com.r3.corda.signing
 
-import net.corda.signing.configuration.Parameters
+import com.r3.corda.signing.configuration.Parameters
 import java.util.*
-import net.corda.signing.SigningServiceIntegrationTest.Companion.DB_NAME
-import net.corda.signing.SigningServiceIntegrationTest.Companion.HOST
-import net.corda.signing.SigningServiceIntegrationTest.Companion.H2_TCP_PORT
+import com.r3.corda.signing.SigningServiceIntegrationTest.Companion.DB_NAME
+import com.r3.corda.signing.SigningServiceIntegrationTest.Companion.HOST
+import com.r3.corda.signing.SigningServiceIntegrationTest.Companion.H2_TCP_PORT
 
 /**
  * The main method for an interactive HSM signing service test/demo. It is supposed to be executed with the
diff --git a/signing-server/src/integration-test/kotlin/net/corda/signing/SigningServiceIntegrationTest.kt b/signing-server/src/integration-test/kotlin/com/r3/corda/signing/SigningServiceIntegrationTest.kt
similarity index 95%
rename from signing-server/src/integration-test/kotlin/net/corda/signing/SigningServiceIntegrationTest.kt
rename to signing-server/src/integration-test/kotlin/com/r3/corda/signing/SigningServiceIntegrationTest.kt
index db2a8bba4d..ff63522880 100644
--- a/signing-server/src/integration-test/kotlin/net/corda/signing/SigningServiceIntegrationTest.kt
+++ b/signing-server/src/integration-test/kotlin/com/r3/corda/signing/SigningServiceIntegrationTest.kt
@@ -1,4 +1,4 @@
-package net.corda.signing
+package com.r3.corda.signing
 
 import com.google.common.net.HostAndPort
 import com.nhaarman.mockito_kotlin.any
@@ -20,10 +20,10 @@ import net.corda.node.utilities.X509Utilities
 import net.corda.node.utilities.configureDatabase
 import net.corda.node.utilities.registration.HTTPNetworkRegistrationService
 import net.corda.node.utilities.registration.NetworkRegistrationHelper
-import net.corda.signing.hsm.HsmSigner
-import net.corda.signing.persistence.ApprovedCertificateRequestData
-import net.corda.signing.persistence.DBCertificateRequestStorage
-import net.corda.signing.persistence.SigningServerSchemaService
+import com.r3.corda.signing.hsm.HsmSigner
+import com.r3.corda.signing.persistence.ApprovedCertificateRequestData
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage
+import com.r3.corda.signing.persistence.SigningServerSchemaService
 import net.corda.testing.ALICE
 import net.corda.testing.BOB
 import net.corda.testing.CHARLIE
@@ -37,7 +37,7 @@ import java.util.*
 import kotlin.concurrent.scheduleAtFixedRate
 import kotlin.concurrent.thread
 import com.r3.corda.doorman.persistence.DBCertificateRequestStorage.CertificateSigningRequest as DoormanRequest
-import net.corda.signing.persistence.DBCertificateRequestStorage.CertificateSigningRequest as SigningServerRequest
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage.CertificateSigningRequest as SigningServerRequest
 
 class SigningServiceIntegrationTest {
 
diff --git a/signing-server/src/main/kotlin/net/corda/signing/Main.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/Main.kt
similarity index 84%
rename from signing-server/src/main/kotlin/net/corda/signing/Main.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/Main.kt
index cde5e537cc..abd04ab9be 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/Main.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/Main.kt
@@ -1,17 +1,17 @@
-package net.corda.signing
+package com.r3.corda.signing
 
 import net.corda.node.utilities.configureDatabase
-import net.corda.signing.authentication.Authenticator
-import net.corda.signing.authentication.createProvider
-import net.corda.signing.configuration.Parameters
-import net.corda.signing.configuration.parseParameters
-import net.corda.signing.generator.KeyCertificateGenerator
-import net.corda.signing.hsm.HsmSigner
-import net.corda.signing.menu.Menu
-import net.corda.signing.persistence.ApprovedCertificateRequestData
-import net.corda.signing.persistence.DBCertificateRequestStorage
-import net.corda.signing.persistence.SigningServerSchemaService
-import net.corda.signing.utils.mapCryptoServerException
+import com.r3.corda.signing.authentication.Authenticator
+import com.r3.corda.signing.authentication.createProvider
+import com.r3.corda.signing.configuration.Parameters
+import com.r3.corda.signing.configuration.parseParameters
+import com.r3.corda.signing.generator.KeyCertificateGenerator
+import com.r3.corda.signing.hsm.HsmSigner
+import com.r3.corda.signing.menu.Menu
+import com.r3.corda.signing.persistence.ApprovedCertificateRequestData
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage
+import com.r3.corda.signing.persistence.SigningServerSchemaService
+import com.r3.corda.signing.utils.mapCryptoServerException
 
 fun main(args: Array<String>) {
     run(parseParameters(*args))
@@ -21,7 +21,7 @@ fun run(parameters: Parameters) {
     parameters.run {
         // Create DB connection.
         checkNotNull(dataSourceProperties)
-        val database = configureDatabase(dataSourceProperties!!, databaseProperties, { SigningServerSchemaService() }, createIdentityService = {
+        val database = configureDatabase(dataSourceProperties, databaseProperties, { SigningServerSchemaService() }, createIdentityService = {
             // Identity service not needed
             throw UnsupportedOperationException()
         })
diff --git a/signing-server/src/main/kotlin/net/corda/signing/authentication/AuthMode.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/authentication/AuthMode.kt
similarity index 68%
rename from signing-server/src/main/kotlin/net/corda/signing/authentication/AuthMode.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/authentication/AuthMode.kt
index 71cf3d715d..64504d80c9 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/authentication/AuthMode.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/authentication/AuthMode.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.authentication
+package com.r3.corda.signing.authentication
 
 /*
  * Supported authentication modes
diff --git a/signing-server/src/main/kotlin/net/corda/signing/authentication/Authenticator.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/authentication/Authenticator.kt
similarity index 98%
rename from signing-server/src/main/kotlin/net/corda/signing/authentication/Authenticator.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/authentication/Authenticator.kt
index aada74ba0a..1c9e36bc8b 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/authentication/Authenticator.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/authentication/Authenticator.kt
@@ -1,7 +1,7 @@
-package net.corda.signing.authentication
+package com.r3.corda.signing.authentication
 
 import CryptoServerJCE.CryptoServerProvider
-import net.corda.signing.configuration.Parameters
+import com.r3.corda.signing.configuration.Parameters
 import java.io.ByteArrayInputStream
 import java.io.ByteArrayOutputStream
 import java.io.Console
diff --git a/signing-server/src/main/kotlin/net/corda/signing/configuration/Configuration.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/configuration/Configuration.kt
similarity index 97%
rename from signing-server/src/main/kotlin/net/corda/signing/configuration/Configuration.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/configuration/Configuration.kt
index 245a6414c3..834589d49d 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/configuration/Configuration.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/configuration/Configuration.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.configuration
+package com.r3.corda.signing.configuration
 
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
@@ -8,7 +8,7 @@ import joptsimple.OptionParser
 import net.corda.core.internal.div
 import net.corda.node.utilities.X509Utilities
 import net.corda.nodeapi.config.parseAs
-import net.corda.signing.authentication.AuthMode
+import com.r3.corda.signing.authentication.AuthMode
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.util.*
@@ -77,7 +77,7 @@ fun parseParameters(vararg args: String): Parameters {
     val argConfig = args.toConfigWithOptions {
         accepts("basedir", "Overriding configuration filepath, default to current directory.").withRequiredArg().defaultsTo(".").describedAs("filepath")
         accepts("configFile", "Overriding configuration file. (default: <<current directory>>/node.conf)").withRequiredArg().describedAs("filepath")
-        accepts("device", "CryptoServer device address (default: ${Parameters.DEFAULT_DEVICE})").withRequiredArg().defaultsTo(Parameters.DEFAULT_DEVICE)
+        accepts("device", "CryptoServer device address (default: ${Parameters.DEFAULT_DEVICE})").withRequiredArg()
         accepts("keyStorePass", "Password for the key store").withRequiredArg().describedAs("password")
         accepts("keyGroup", "CryptoServer key group (default: ${Parameters.DEFAULT_KEY_GROUP})").withRequiredArg().defaultsTo(Parameters.DEFAULT_KEY_GROUP)
         accepts("keySpecifier", "CryptoServer key specifier (default: ${Parameters.DEFAULT_KEY_SPECIFIER})").withRequiredArg().ofType(Int::class.java).defaultsTo(Parameters.DEFAULT_KEY_SPECIFIER)
diff --git a/signing-server/src/main/kotlin/net/corda/signing/generator/KeyCertificateGenerator.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/generator/KeyCertificateGenerator.kt
similarity index 92%
rename from signing-server/src/main/kotlin/net/corda/signing/generator/KeyCertificateGenerator.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/generator/KeyCertificateGenerator.kt
index a262d14181..623bfb88cb 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/generator/KeyCertificateGenerator.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/generator/KeyCertificateGenerator.kt
@@ -1,14 +1,14 @@
-package net.corda.signing.generator
+package com.r3.corda.signing.generator
 
 import CryptoServerCXI.CryptoServerCXI
 import CryptoServerJCE.CryptoServerProvider
 import net.corda.node.utilities.addOrReplaceKey
-import net.corda.signing.authentication.Authenticator
-import net.corda.signing.utils.X509Utilities.createIntermediateCert
-import net.corda.signing.utils.X509Utilities.createSelfSignedCACert
-import net.corda.signing.utils.X509Utilities.getAndInitializeKeyStore
-import net.corda.signing.utils.X509Utilities.getCleanEcdsaKeyPair
-import net.corda.signing.utils.X509Utilities.retrieveCertificateAndKeys
+import com.r3.corda.signing.authentication.Authenticator
+import com.r3.corda.signing.utils.X509Utilities.createIntermediateCert
+import com.r3.corda.signing.utils.X509Utilities.createSelfSignedCACert
+import com.r3.corda.signing.utils.X509Utilities.getAndInitializeKeyStore
+import com.r3.corda.signing.utils.X509Utilities.getCleanEcdsaKeyPair
+import com.r3.corda.signing.utils.X509Utilities.retrieveCertificateAndKeys
 import java.security.KeyPair
 import java.security.KeyStore
 import java.security.PrivateKey
diff --git a/signing-server/src/main/kotlin/net/corda/signing/hsm/HsmSigner.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/hsm/HsmSigner.kt
similarity index 80%
rename from signing-server/src/main/kotlin/net/corda/signing/hsm/HsmSigner.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/hsm/HsmSigner.kt
index 56541b31f5..908875dd50 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/hsm/HsmSigner.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/hsm/HsmSigner.kt
@@ -1,13 +1,13 @@
-package net.corda.signing.hsm
+package com.r3.corda.signing.hsm
 
-import net.corda.signing.authentication.Authenticator
-import net.corda.signing.authentication.readPassword
-import net.corda.signing.persistence.ApprovedCertificateRequestData
-import net.corda.signing.persistence.DBCertificateRequestStorage
-import net.corda.signing.utils.X509Utilities.buildCertPath
-import net.corda.signing.utils.X509Utilities.createClientCertificate
-import net.corda.signing.utils.X509Utilities.getAndInitializeKeyStore
-import net.corda.signing.utils.X509Utilities.retrieveCertificateAndKeys
+import com.r3.corda.signing.authentication.Authenticator
+import com.r3.corda.signing.authentication.readPassword
+import com.r3.corda.signing.persistence.ApprovedCertificateRequestData
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage
+import com.r3.corda.signing.utils.X509Utilities.buildCertPath
+import com.r3.corda.signing.utils.X509Utilities.createClientCertificate
+import com.r3.corda.signing.utils.X509Utilities.getAndInitializeKeyStore
+import com.r3.corda.signing.utils.X509Utilities.retrieveCertificateAndKeys
 
 /**
  * Encapsulates certificate signing logic
diff --git a/signing-server/src/main/kotlin/net/corda/signing/hsm/Signer.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/hsm/Signer.kt
similarity index 69%
rename from signing-server/src/main/kotlin/net/corda/signing/hsm/Signer.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/hsm/Signer.kt
index 41951f957c..1a9ef02981 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/hsm/Signer.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/hsm/Signer.kt
@@ -1,6 +1,6 @@
-package net.corda.signing.hsm
+package com.r3.corda.signing.hsm
 
-import net.corda.signing.persistence.ApprovedCertificateRequestData
+import com.r3.corda.signing.persistence.ApprovedCertificateRequestData
 
 /**
  * Encapsulates the logic related to the certificate signing process.
diff --git a/signing-server/src/main/kotlin/net/corda/signing/menu/Menu.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/menu/Menu.kt
similarity index 98%
rename from signing-server/src/main/kotlin/net/corda/signing/menu/Menu.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/menu/Menu.kt
index 7c51d65a9b..0c716cae44 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/menu/Menu.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/menu/Menu.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.menu
+package com.r3.corda.signing.menu
 
 data class MenuItem(val key: String, val label: String, val action: () -> Unit, val isTerminating: Boolean = false)
 
diff --git a/signing-server/src/main/kotlin/net/corda/signing/persistence/CertificateRequestStorage.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/CertificateRequestStorage.kt
similarity index 94%
rename from signing-server/src/main/kotlin/net/corda/signing/persistence/CertificateRequestStorage.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/persistence/CertificateRequestStorage.kt
index 37969fcf8f..29669dedb4 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/persistence/CertificateRequestStorage.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/CertificateRequestStorage.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.persistence
+package com.r3.corda.signing.persistence
 
 /**
  * Provides an API for database level manipulations of CSRs (Certificate Signing Requests).
diff --git a/signing-server/src/main/kotlin/net/corda/signing/persistence/DBCertificateRequestStorage.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorage.kt
similarity index 95%
rename from signing-server/src/main/kotlin/net/corda/signing/persistence/DBCertificateRequestStorage.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorage.kt
index b0756f6a51..9cda49c012 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/persistence/DBCertificateRequestStorage.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorage.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.persistence
+package com.r3.corda.signing.persistence
 
 import net.corda.node.utilities.CordaPersistence
 import org.bouncycastle.pkcs.PKCS10CertificationRequest
@@ -91,7 +91,7 @@ class DBCertificateRequestStorage(private val database: CordaPersistence) : Cert
                     where(builder.equal(get<Status>(CertificateSigningRequest::status.name), status))
                 }
             }
-            session.createQuery(query).resultList.map { it.toRequestData() }
+            session.createQuery(query).setLockMode(LockModeType.PESSIMISTIC_WRITE).resultList.map { it.toRequestData() }
         }
     }
 
diff --git a/signing-server/src/main/kotlin/net/corda/signing/persistence/SigningServerSchemaService.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/SigningServerSchemaService.kt
similarity index 95%
rename from signing-server/src/main/kotlin/net/corda/signing/persistence/SigningServerSchemaService.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/persistence/SigningServerSchemaService.kt
index de52f5a4f4..b240d2bdb9 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/persistence/SigningServerSchemaService.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/persistence/SigningServerSchemaService.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.persistence
+package com.r3.corda.signing.persistence
 
 import net.corda.core.contracts.ContractState
 import net.corda.core.schemas.MappedSchema
diff --git a/signing-server/src/main/kotlin/net/corda/signing/utils/HsmErrors.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/utils/HsmErrors.kt
similarity index 97%
rename from signing-server/src/main/kotlin/net/corda/signing/utils/HsmErrors.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/utils/HsmErrors.kt
index ba4b606846..9427ea59c6 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/utils/HsmErrors.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/utils/HsmErrors.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.utils
+package com.r3.corda.signing.utils
 
 import CryptoServerAPI.CryptoServerException
 import java.util.HashMap
diff --git a/signing-server/src/main/kotlin/net/corda/signing/utils/X509Utils.kt b/signing-server/src/main/kotlin/com/r3/corda/signing/utils/X509Utils.kt
similarity index 99%
rename from signing-server/src/main/kotlin/net/corda/signing/utils/X509Utils.kt
rename to signing-server/src/main/kotlin/com/r3/corda/signing/utils/X509Utils.kt
index 8a4e0a43c8..34ae6f3cbb 100644
--- a/signing-server/src/main/kotlin/net/corda/signing/utils/X509Utils.kt
+++ b/signing-server/src/main/kotlin/com/r3/corda/signing/utils/X509Utils.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.utils
+package com.r3.corda.signing.utils
 
 import CryptoServerJCE.CryptoServerProvider
 import net.corda.core.identity.CordaX500Name
diff --git a/signing-server/src/main/resources/net/corda/signing/utils/hsm_errors b/signing-server/src/main/resources/com/r3/corda/signing/utils/hsm_errors
similarity index 100%
rename from signing-server/src/main/resources/net/corda/signing/utils/hsm_errors
rename to signing-server/src/main/resources/com/r3/corda/signing/utils/hsm_errors
diff --git a/signing-server/src/test/kotlin/net/corda/signing/authentication/AuthenticatorTest.kt b/signing-server/src/test/kotlin/com/r3/corda/signing/authentication/AuthenticatorTest.kt
similarity index 98%
rename from signing-server/src/test/kotlin/net/corda/signing/authentication/AuthenticatorTest.kt
rename to signing-server/src/test/kotlin/com/r3/corda/signing/authentication/AuthenticatorTest.kt
index dc6b2dc1cc..19a85299f1 100644
--- a/signing-server/src/test/kotlin/net/corda/signing/authentication/AuthenticatorTest.kt
+++ b/signing-server/src/test/kotlin/com/r3/corda/signing/authentication/AuthenticatorTest.kt
@@ -1,4 +1,4 @@
-package net.corda.signing.authentication
+package com.r3.corda.signing.authentication
 
 import CryptoServerCXI.CryptoServerCXI
 import CryptoServerJCE.CryptoServerProvider
diff --git a/signing-server/src/test/kotlin/net/corda/signing/configuration/ConfigurationTest.kt b/signing-server/src/test/kotlin/com/r3/corda/signing/configuration/ConfigurationTest.kt
similarity index 93%
rename from signing-server/src/test/kotlin/net/corda/signing/configuration/ConfigurationTest.kt
rename to signing-server/src/test/kotlin/com/r3/corda/signing/configuration/ConfigurationTest.kt
index 57b9ee613b..01e57e3880 100644
--- a/signing-server/src/test/kotlin/net/corda/signing/configuration/ConfigurationTest.kt
+++ b/signing-server/src/test/kotlin/com/r3/corda/signing/configuration/ConfigurationTest.kt
@@ -1,7 +1,7 @@
-package net.corda.signing.configuration
+package com.r3.corda.signing.configuration
 
 import com.typesafe.config.ConfigException
-import net.corda.signing.authentication.AuthMode
+import com.r3.corda.signing.authentication.AuthMode
 import org.junit.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
diff --git a/signing-server/src/test/kotlin/net/corda/signing/persistence/DBCertificateRequestStorageTest.kt b/signing-server/src/test/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorageTest.kt
similarity index 95%
rename from signing-server/src/test/kotlin/net/corda/signing/persistence/DBCertificateRequestStorageTest.kt
rename to signing-server/src/test/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorageTest.kt
index d2c26f83fb..d316df0533 100644
--- a/signing-server/src/test/kotlin/net/corda/signing/persistence/DBCertificateRequestStorageTest.kt
+++ b/signing-server/src/test/kotlin/com/r3/corda/signing/persistence/DBCertificateRequestStorageTest.kt
@@ -1,6 +1,5 @@
-package net.corda.signing.persistence
+package com.r3.corda.signing.persistence
 
-import com.r3.corda.doorman.buildCertPath
 import net.corda.core.crypto.Crypto
 import net.corda.core.crypto.SecureHash
 import net.corda.core.identity.CordaX500Name
@@ -8,8 +7,8 @@ import net.corda.node.utilities.CertificateType
 import net.corda.node.utilities.CordaPersistence
 import net.corda.node.utilities.X509Utilities
 import net.corda.node.utilities.configureDatabase
-import net.corda.signing.persistence.DBCertificateRequestStorage.CertificateSigningRequest
-import net.corda.signing.persistence.DBCertificateRequestStorage.Status
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage.CertificateSigningRequest
+import com.r3.corda.signing.persistence.DBCertificateRequestStorage.Status
 import org.bouncycastle.asn1.x509.GeneralName
 import org.bouncycastle.asn1.x509.GeneralSubtree
 import org.bouncycastle.asn1.x509.NameConstraints
@@ -28,6 +27,7 @@ import javax.persistence.criteria.Path
 import javax.persistence.criteria.Predicate
 import kotlin.test.assertEquals
 import kotlin.test.assertNotNull
+import com.r3.corda.signing.utils.X509Utilities.buildCertPath
 
 class DBCertificateRequestStorageTest {
     private val intermediateCAKey = Crypto.generateKeyPair(X509Utilities.DEFAULT_TLS_SIGNATURE_SCHEME)