Introduce full legal names for test parties

Use full names for test parties, ahead of complete X.500 name support.

build.gradle

@@ -188,16 +188,16 @@ tasks.withType(Test) {
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
-    networkMap "Controller"
+    networkMap "CN=Controller,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Controller"
+        name "CN=Controller,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating"]
         p2pPort 10002
         cordapps = []
     }
     node {
-        name "Bank A"
+        name "CN=Bank A,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10012
@@ -206,7 +206,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = []
     }
     node {
-        name "Bank B"
+        name "CN=Bank B,O=R3,OU=corda,L=London,C=UK"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10007

client/rpc/src/test/kotlin/net/corda/client/rpc/AbstractClientRPCTest.kt

@@ -2,6 +2,7 @@ package net.corda.client.rpc
 
 import net.corda.core.messaging.RPCOps
 import net.corda.core.serialization.SerializedBytes
+import net.corda.core.utilities.ALICE
 import net.corda.core.utilities.LogHelper
 import net.corda.node.services.RPCUserService
 import net.corda.node.services.messaging.RPCDispatcher
@@ -73,7 +74,7 @@ abstract class AbstractClientRPCTest {
             override val users: List<User> get() = listOf(rpcUser)
         }
 
-        val dispatcher = object : RPCDispatcher(rpcImpl, userService, "SomeName") {
+        val dispatcher = object : RPCDispatcher(rpcImpl, userService, ALICE.name) {
             override fun send(data: SerializedBytes<*>, toAddress: String) {
                 val msg = serverSession.createMessage(false).apply {
                     writeBodyBufferBytes(data.bytes)

config/dev/generalnodea.conf

@@ -1,4 +1,4 @@
-myLegalName : "Bank A"
+myLegalName : "CN=Bank A,O=Bank A,L=London,C=UK"
 nearestCity : "London"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"

config/dev/nameservernode.conf

@@ -1,4 +1,4 @@
-myLegalName : "Notary Service"
+myLegalName : "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
 nearestCity : "London"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"

core/src/main/kotlin/net/corda/core/utilities/TestConstants.kt

@@ -3,6 +3,7 @@
 package net.corda.core.utilities
 
 import net.corda.core.crypto.*
+import org.bouncycastle.asn1.x500.X500Name
 import java.math.BigInteger
 import java.security.KeyPair
 import java.security.PublicKey
@@ -19,34 +20,34 @@ val DUMMY_KEY_2: KeyPair by lazy { generateKeyPair() }
 
 val DUMMY_NOTARY_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(20)) }
 /** Dummy notary identity for tests and simulations */
-val DUMMY_NOTARY: Party get() = Party("Notary Service", DUMMY_NOTARY_KEY.public)
+val DUMMY_NOTARY: Party get() = Party("CN=Notary Service,O=R3,OU=corda,L=London,C=UK", DUMMY_NOTARY_KEY.public)
 
 val DUMMY_MAP_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(30)) }
 /** Dummy network map service identity for tests and simulations */
-val DUMMY_MAP: Party get() = Party("Network Map Service", DUMMY_MAP_KEY.public)
+val DUMMY_MAP: Party get() = Party("CN=Network Map Service,O=R3,OU=corda,L=London,C=UK", DUMMY_MAP_KEY.public)
 
 val DUMMY_BANK_A_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(40)) }
 /** Dummy bank identity for tests and simulations */
-val DUMMY_BANK_A: Party get() = Party("Bank A", DUMMY_BANK_A_KEY.public)
+val DUMMY_BANK_A: Party get() = Party("CN=Bank A,O=Bank A,L=London,C=UK", DUMMY_BANK_A_KEY.public)
 
 val DUMMY_BANK_B_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(50)) }
 /** Dummy bank identity for tests and simulations */
-val DUMMY_BANK_B: Party get() = Party("Bank B", DUMMY_BANK_B_KEY.public)
+val DUMMY_BANK_B: Party get() = Party("CN=Bank B,O=Bank B,L=New York,C=USA", DUMMY_BANK_B_KEY.public)
 
 val DUMMY_BANK_C_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(60)) }
 /** Dummy bank identity for tests and simulations */
-val DUMMY_BANK_C: Party get() = Party("Bank C", DUMMY_BANK_C_KEY.public)
+val DUMMY_BANK_C: Party get() = Party("CN=Bank C,O=Bank C,L=Tokyo,C=Japan", DUMMY_BANK_C_KEY.public)
 
 
 
 val ALICE_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(70)) }
 /** Dummy individual identity for tests and simulations */
-val ALICE: Party get() = Party("Alice", ALICE_KEY.public)
+val ALICE: Party get() = Party("CN=Alice Corp,O=Alice Corp,L=London,C=UK", ALICE_KEY.public)
 
 val BOB_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(80)) }
 /** Dummy individual identity for tests and simulations */
-val BOB: Party get() = Party("Bob", BOB_KEY.public)
+val BOB: Party get() = Party("CN=Bob Plc,O=Bob Plc,L=London,C=UK", BOB_KEY.public)
 
 val CHARLIE_KEY: KeyPair by lazy { entropyToKeyPair(BigInteger.valueOf(90)) }
 /** Dummy individual identity for tests and simulations */
-val CHARLIE: Party get() = Party("Charlie", CHARLIE_KEY.public)
+val CHARLIE: Party get() = Party("CN=Charlie Ltd,O=Charlie Ltd,L=London,C=UK", CHARLIE_KEY.public)

core/src/test/kotlin/net/corda/core/crypto/PartyTest.kt

@@ -1,5 +1,6 @@
 package net.corda.core.crypto
 
+import net.corda.core.utilities.ALICE
 import org.junit.Test
 import java.math.BigInteger
 import kotlin.test.assertEquals
@@ -11,7 +12,7 @@ class PartyTest {
         val key = entropyToKeyPair(BigInteger.valueOf(20170207L)).public
         val differentKey = entropyToKeyPair(BigInteger.valueOf(7201702L)).public
         val anonymousParty = AnonymousParty(key)
-        val party = Party("test key", key)
+        val party = Party(ALICE.name, key)
         assertEquals<AbstractParty>(party, anonymousParty)
         assertEquals<AbstractParty>(anonymousParty, party)
         assertNotEquals<AbstractParty>(AnonymousParty(differentKey), anonymousParty)

core/src/test/kotlin/net/corda/core/node/ServiceInfoTests.kt

@@ -1,5 +1,6 @@
 package net.corda.core.node
 
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
 import org.junit.Test
@@ -8,7 +9,7 @@ import kotlin.test.assertFailsWith
 
 class ServiceInfoTests {
     val serviceType = ServiceType.getServiceType("test", "service").getSubType("subservice")
-    val name = "service.name"
+    val name = "CN=service.name,O=R3,OU=corda,L=London,C=UK"
 
     @Test
     fun `type and name encodes correctly`() {

docs/source/corda-configuration-file.rst

@@ -34,7 +34,7 @@ NetworkMapService plus Simple Notary configuration file.
 
 .. parsed-literal::
 
-    myLegalName : "Notary Service"
+    myLegalName : "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     nearestCity : "London"
     keyStorePassword : "cordacadevpass"
     trustStorePassword : "trustpass"

docs/source/creating-a-cordapp.rst

@@ -194,9 +194,9 @@ is a three node example;
 
     task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         directory "./build/nodes" // The output directory
-        networkMap "Controller" // The artemis address of the node named here will be used as the networkMapService.address on all other nodes.
+        networkMap "CN=Controller,O=R3,OU=corda,L=London,C=UK" // The distinguished name of the node named here will be used as the networkMapService.address on all other nodes.
         node {
-            name "Controller"
+            name "CN=Controller,O=R3,OU=corda,L=London,C=UK"
             nearestCity "London"
             advertisedServices = [ "corda.notary.validating" ]
             p2pPort 10002
@@ -206,7 +206,7 @@ is a three node example;
             cordapps []
         }
         node {
-            name "NodeA"
+            name "CN=NodeA,O=R3,OU=corda,L=London,C=UK"
             nearestCity "London"
             advertisedServices = []
             p2pPort 10005
@@ -216,7 +216,7 @@ is a three node example;
             cordapps []
         }
         node {
-            name "NodeB"
+            name "CN=NodeB,O=R3,OU=corda,L=New York,C=USA"
             nearestCity "New York"
             advertisedServices = []
             p2pPort 10008

docs/source/example-code/build.gradle

@@ -76,9 +76,9 @@ task integrationTest(type: Test) {
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
-    networkMap "Notary"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Notary"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating"]
         p2pPort 10002
@@ -87,7 +87,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = []
     }
     node {
-        name "Alice"
+        name "CN=Alice Corp,O=Alice Corp,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10005

docs/source/example-code/src/main/kotlin/net/corda/docs/ClientRpcTutorial.kt

@@ -3,6 +3,7 @@ package net.corda.docs
 import net.corda.contracts.asset.Cash
 import net.corda.core.contracts.Amount
 import net.corda.core.contracts.USD
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.startFlow
 import net.corda.core.node.CordaPluginRegistry
@@ -11,6 +12,8 @@ import net.corda.core.serialization.CordaSerializable
 import net.corda.core.serialization.OpaqueBytes
 import net.corda.core.serialization.SerializationCustomization
 import net.corda.core.transactions.SignedTransaction
+import net.corda.core.utilities.ALICE
+import net.corda.core.utilities.DUMMY_NOTARY
 import net.corda.flows.CashExitFlow
 import net.corda.flows.CashIssueFlow
 import net.corda.flows.CashPaymentFlow
@@ -46,8 +49,8 @@ fun main(args: Array<String>) {
             startFlowPermission<CashExitFlow>()))
 
     driver(driverDirectory = baseDirectory) {
-        startNode("Notary", advertisedServices = setOf(ServiceInfo(ValidatingNotaryService.type)))
+        startNode(DUMMY_NOTARY.name, advertisedServices = setOf(ServiceInfo(ValidatingNotaryService.type)))
-        val node = startNode("Alice", rpcUsers = listOf(user)).get()
+        val node = startNode(ALICE.name, rpcUsers = listOf(user)).get()
         // END 1
 
         // START 2

docs/source/example-code/src/main/resources/example-network-map-node.conf

@@ -1,4 +1,4 @@
-myLegalName : "Notary Service"
+myLegalName : "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
 nearestCity : "London"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"

docs/source/example-code/src/main/resources/example-node.conf

@@ -1,4 +1,4 @@
-myLegalName : "Bank A"
+myLegalName : "CN=Bank A,O=Bank A,L=London,C=UK"
 nearestCity : "London"
 keyStorePassword : "cordacadevpass"
 trustStorePassword : "trustpass"
@@ -14,7 +14,7 @@ webAddress : "localhost:10004"
 extraAdvertisedServiceIds : [ "corda.interest_rates" ]
 networkMapService : {
     address : "my-network-map:10000"
-    legalName : "Network Map Service"
+    legalName : "CN=Network Map Service,O=R3,OU=corda,L=London,C=UK"
 }
 useHTTPS : false
 rpcUsers : [

docs/source/example-code/src/main/resources/example-out-of-process-verifier-node.conf

@@ -1,9 +1,9 @@
-myLegalName : "Bank A"
+myLegalName : "CN=Bank A,O=Bank A,L=London,C=UK"
 nearestCity : "London"
 p2pAddress : "my-corda-node:10002"
 webAddress : "localhost:10003"
 networkMapService : {
     address : "my-network-map:10000"
-    legalName : "Network Map Service"
+    legalName : "CN=Network Map Service,O=R3,OU=corda,L=London,C=UK"
 }
 verifierType: "OutOfProcess"

docs/source/release-notes.rst

@@ -12,6 +12,16 @@ composite key signatures. This will form the underlying basis of future work to
 formats to enable interoperability with other systems, as well as enabling the use of composite signatures on X.509
 certificates to prove association between transaction keys and identity keys.
 
+The identity work is likely to require changes to existing code and configurations, to replace party names with full
+X.500 distinguished names (see RFC 1779 for details on the construction of distinguished names). Generally:
+
+* "myLegalName" in node configurations will need to be replaced, for example "Bank A" is replaced with
+  "CN=Bank A,O=Bank A,L=London,C=UK". Obviously organisation, location and country ("O", "L" and "C" respectively)
+  must be given values which are appropriate to the node, do not just use these example values.
+* If you are constructing ``Party`` objects, be aware that the name must now be a distinguished name.
+* If you are using mock parties for testing, try to standardise on the ``DUMMY_NOTARY``, ``DUMMY_BANK_A``, etc. provided
+  in order to ensure consistency.
+
 We have updated DemoBench so that it is installed as "Corda DemoBench" for both Windows and MacOSX. The original version was installed as just "DemoBench", and so will not be overwritten automatically by the new version.
 
 Milestone 10

docs/source/shell.rst

@@ -67,7 +67,7 @@ Yaml (yet another markup language) is a simple JSON-like way to describe object
 that make it helpful for our use case, like a lightweight syntax and support for "bare words" which mean you can
 often skip the quotes around strings. Here is an example of how this syntax is used:
 
-``flow start CashIssue amount: $1000, issueRef: 1234, recipient: Bank A, notary: Notary Service``
+``flow start CashIssue amount: $1000, issueRef: 1234, recipient: "CN=Bank A,O=Bank A,L=London,C=UK", notary: "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"``
 
 This invokes a constructor of a flow with the following prototype in the code:
 
@@ -140,4 +140,4 @@ The shell will be enhanced over time. The currently known limitations include:
 .. _Yaml: http://www.yaml.org/spec/1.2/spec.html
 .. _the defined parsers: api/kotlin/corda/net.corda.jackson/-jackson-support/index.html
 .. _Groovy: http://groovy-lang.org/
-.. _CRaSH: http://www.crashub.org/
+.. _CRaSH: http://www.crashub.org/

docs/source/tutorial-clientrpc-api.rst

@@ -116,7 +116,7 @@ In the instructions above the server node permissions are configured programmati
 
         driver(driverDirectory = baseDirectory) {
             val user = User("user", "password", permissions = setOf(startFlowPermission<CashFlow>()))
-            val node = startNode("Alice", rpcUsers = listOf(user)).get()
+            val node = startNode("CN=Alice Corp,O=Alice Corp,L=London,C=UK", rpcUsers = listOf(user)).get()
 
 When starting a standalone node using a configuration file we must supply the RPC credentials as follows:
 

docs/source/tutorial-cordapp.rst

@@ -774,9 +774,9 @@ like to deploy for testing. See further details below:
 
   task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['jar']) {
       directory "./kotlin-source/build/nodes"                            // The output directory.
-      networkMap "Controller"                              // The artemis address of the node to be used as the network map.
+      networkMap "CN=Controller,O=R3,OU=corda,L=London,C=UK" // The distinguished name of the node to be used as the network map.
       node {
-          name "Controller"                                // Artemis name of node to be deployed.
+          name "CN=Controller,O=R3,OU=corda,L=London,C=UK" // Distinguished name of node to be deployed.
           nearestCity "London"                             // For use with the network visualiser.
           advertisedServices = ["corda.notary.validating"] // A list of services you wish the node to offer.
           p2pPort 10002
@@ -785,7 +785,7 @@ like to deploy for testing. See further details below:
           cordapps = []                                    // Add package names of CordaApps.
       }
       node {                                               // Create an additional node.
-          name "NodeA"
+          name "CN=NodeA,O=R3,OU=corda,L=London,C=UK"
           nearestCity "London"
           advertisedServices = []
           p2pPort 10005

experimental/src/test/kotlin/net/corda/contracts/universal/ContractDefinition.kt

@@ -1,14 +1,18 @@
 package net.corda.contracts.universal
 
 import net.corda.core.crypto.Party
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
+import net.corda.core.utilities.ALICE
+import net.corda.testing.MEGA_CORP
+import net.corda.testing.MINI_CORP
 import org.junit.Test
 import java.util.*
 
 // Test parties
-val acmeCorp = Party("ACME Corporation", generateKeyPair().public)
+val acmeCorp = Party(ALICE.name, generateKeyPair().public)
-val highStreetBank = Party("High Street Bank", generateKeyPair().public)
+val highStreetBank = Party(MEGA_CORP.name, generateKeyPair().public)
-val momAndPop = Party("Mom and Pop", generateKeyPair().public)
+val momAndPop = Party(MINI_CORP.name, generateKeyPair().public)
 
 val acmeCorporationHasDefaulted = TerminalEvent(acmeCorp, generateKeyPair().public)
 

finance/src/main/kotlin/net/corda/contracts/asset/Cash.kt

@@ -203,7 +203,7 @@ infix fun Cash.State.`with deposit`(deposit: PartyAndReference): Cash.State = wi
 /** A randomly generated key. */
 val DUMMY_CASH_ISSUER_KEY by lazy { entropyToKeyPair(BigInteger.valueOf(10)) }
 /** A dummy, randomly generated issuer party by the name of "Snake Oil Issuer" */
-val DUMMY_CASH_ISSUER by lazy { Party("Snake Oil Issuer", DUMMY_CASH_ISSUER_KEY.public).ref(1) }
+val DUMMY_CASH_ISSUER by lazy { Party("CN=Snake Oil Issuer,O=R3,OU=corda,L=London,C=UK", DUMMY_CASH_ISSUER_KEY.public).ref(1) }
 /** An extension property that lets you write 100.DOLLARS.CASH */
 val Amount<Currency>.CASH: Cash.State get() = Cash.State(Amount(quantity, Issued(DUMMY_CASH_ISSUER, token)), NullPublicKey)
 /** An extension property that lets you get a cash state from an issued token, under the [NullPublicKey] */

finance/src/main/kotlin/net/corda/contracts/asset/Obligation.kt

@@ -719,7 +719,7 @@ infix fun <T : Any> Obligation.State<T>.`issued by`(party: AbstractParty) = copy
 /** A randomly generated key. */
 val DUMMY_OBLIGATION_ISSUER_KEY by lazy { entropyToKeyPair(BigInteger.valueOf(10)) }
 /** A dummy, randomly generated issuer party by the name of "Snake Oil Issuer" */
-val DUMMY_OBLIGATION_ISSUER by lazy { Party("Snake Oil Issuer", DUMMY_OBLIGATION_ISSUER_KEY.public) }
+val DUMMY_OBLIGATION_ISSUER by lazy { Party("CN=Snake Oil Issuer,O=R3,OU=corda,L=London,C=UK", DUMMY_OBLIGATION_ISSUER_KEY.public) }
 
 val Issued<Currency>.OBLIGATION_DEF: Obligation.Terms<Currency>
     get() = Obligation.Terms(nonEmptySetOf(Cash().legalContractReference), nonEmptySetOf(this), TEST_TX_TIME)

node/src/integration-test/kotlin/net/corda/node/driver/DriverTests.kt

@@ -42,7 +42,7 @@ class DriverTests {
     fun `simple node startup and shutdown`() {
         val handles = driver {
             val notary = startNode(DUMMY_NOTARY.name, setOf(ServiceInfo(SimpleNotaryService.type)))
-            val regulator = startNode("Regulator", setOf(ServiceInfo(RegulatorService.type)))
+            val regulator = startNode("CN=Regulator,O=R3,OU=corda,L=London,C=UK", setOf(ServiceInfo(RegulatorService.type)))
             listOf(nodeMustBeUp(notary), nodeMustBeUp(regulator))
         }
         handles.map { nodeMustBeDown(it) }

node/src/integration-test/kotlin/net/corda/node/services/BFTNotaryServiceTests.kt

@@ -98,4 +98,4 @@ class BFTNotaryServiceTests : NodeBasedTest() {
 
         return remainingNodes + masterNode
     }
-}
+}

node/src/integration-test/kotlin/net/corda/node/services/RaftNotaryServiceTests.kt

@@ -22,7 +22,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertFailsWith
 
 class RaftNotaryServiceTests : NodeBasedTest() {
-    private val notaryName = "RAFT Notary Service"
+    private val notaryName = "CN=RAFT Notary Service,O=R3,OU=corda,L=London,C=UK"
 
     @Test
     fun `detect double spend`() {

node/src/integration-test/kotlin/net/corda/services/messaging/P2PSecurityTest.kt

@@ -42,9 +42,9 @@ class P2PSecurityTest : NodeBasedTest() {
 
     @Test
     fun `register with the network map service using a legal name different from the TLS CN`() {
-        startSimpleNode("Attacker").use {
+        startSimpleNode("CN=Attacker,O=R3,OU=corda,L=London,C=UK").use {
             // Register with the network map using a different legal name
-            val response = it.registerWithNetworkMap("Legit Business")
+            val response = it.registerWithNetworkMap("CN=Legit Business,O=R3,OU=corda,L=London,C=UK")
             // We don't expect a response because the network map's host verification will prevent a connection back
             // to the attacker as the TLS CN will not match the legal name it has just provided
             assertThatExceptionOfType(TimeoutException::class.java).isThrownBy {

node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt

@@ -51,6 +51,7 @@ import net.corda.node.utilities.AffinityExecutor
 import net.corda.node.utilities.configureDatabase
 import net.corda.node.utilities.transaction
 import org.apache.activemq.artemis.utils.ReusableLatch
+import org.bouncycastle.asn1.x500.X500Name
 import org.jetbrains.exposed.sql.Database
 import org.slf4j.Logger
 import java.io.IOException
@@ -305,7 +306,7 @@ abstract class AbstractNode(open val configuration: NodeConfiguration,
     protected open fun makeServiceEntries(): List<ServiceEntry> {
         return advertisedServices.map {
             val serviceId = it.type.id
-            val serviceName = it.name ?: "$serviceId|${configuration.myLegalName}"
+            val serviceName = it.name ?: "ou=$serviceId,${configuration.myLegalName}"
             val identity = obtainKeyPair(configuration.baseDirectory, serviceId + "-private-key", serviceId + "-public", serviceName).first
             ServiceEntry(it, identity)
         }

node/src/test/kotlin/net/corda/node/InteractiveShellTest.kt

@@ -5,6 +5,7 @@ import com.google.common.util.concurrent.ListenableFuture
 import net.corda.core.contracts.Amount
 import net.corda.core.crypto.Party
 import net.corda.core.crypto.SecureHash
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.flows.FlowLogic
 import net.corda.core.flows.FlowStateMachine
 import net.corda.core.flows.StateMachineRunId
@@ -16,6 +17,7 @@ import net.corda.core.utilities.UntrustworthyData
 import net.corda.jackson.JacksonSupport
 import net.corda.node.services.identity.InMemoryIdentityService
 import net.corda.node.shell.InteractiveShell
+import net.corda.testing.MEGA_CORP
 import org.junit.Test
 import org.slf4j.Logger
 import java.util.*
@@ -28,12 +30,12 @@ class InteractiveShellTest {
         constructor(b: Int, c: String) : this(b.toString() + c)
         constructor(amount: Amount<Currency>) : this(amount.toString())
         constructor(pair: Pair<Amount<Currency>, SecureHash.SHA256>) : this(pair.toString())
-        constructor(party: Party) : this(party.name)
+        constructor(party: Party) : this(party.name.toString())
-
         override fun call() = a
     }
 
-    private val ids = InMemoryIdentityService().apply { registerIdentity(Party("SomeCorp", DUMMY_PUBKEY_1)) }
+    private val someCorpLegalName = MEGA_CORP.name
+    private val ids = InMemoryIdentityService().apply { registerIdentity(Party(MEGA_CORP.name, DUMMY_PUBKEY_1)) }
     private val om = JacksonSupport.createInMemoryMapper(ids, YAMLFactory())
 
     private fun check(input: String, expected: String) {
@@ -66,7 +68,7 @@ class InteractiveShellTest {
     fun flowTooManyParams() = check("b: 12, c: Yo, d: Bar", "")
 
     @Test
-    fun party() = check("party: SomeCorp", "SomeCorp")
+    fun party() = check("party: \"${someCorpLegalName}\"", someCorpLegalName)
 
     class DummyFSM(val logic: FlowA) : FlowStateMachine<Any?> {
         override fun <T : Any> sendAndReceive(receiveType: Class<T>, otherParty: Party, payload: Any, sessionFlow: FlowLogic<*>): UntrustworthyData<T> {

node/src/test/kotlin/net/corda/node/services/NotaryChangeTests.kt

@@ -2,6 +2,7 @@ package net.corda.node.services
 
 import net.corda.core.contracts.*
 import net.corda.core.crypto.Party
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.getOrThrow
 import net.corda.core.node.services.ServiceInfo
@@ -74,7 +75,7 @@ class NotaryChangeTests {
     @Test
     fun `should throw when a participant refuses to change Notary`() {
         val state = issueMultiPartyState(clientNodeA, clientNodeB, oldNotaryNode)
-        val newEvilNotary = Party("Evil Notary", generateKeyPair().public)
+        val newEvilNotary = Party("CN=Evil Notary,O=Evil R3,OU=corda,L=London,C=UK", generateKeyPair().public)
         val flow = Instigator(state, newEvilNotary)
         val future = clientNodeA.services.startFlow(flow)
 

node/src/test/kotlin/net/corda/node/services/config/FullNodeConfigurationTest.kt

@@ -1,5 +1,6 @@
 package net.corda.node.services.config
 
+import net.corda.core.utilities.ALICE
 import net.corda.nodeapi.User
 import net.corda.testing.testConfiguration
 import org.assertj.core.api.Assertions.assertThatThrownBy
@@ -10,7 +11,7 @@ class FullNodeConfigurationTest {
     @Test
     fun `Artemis special characters not permitted in RPC usernames`() {
         fun configWithRPCUsername(username: String): FullNodeConfiguration {
-            return testConfiguration(Paths.get("."), "NodeA", 0).copy(
+            return testConfiguration(Paths.get("."), ALICE.name, 0).copy(
                     rpcUsers = listOf(User(username, "pass", emptySet())))
         }
 

node/src/test/kotlin/net/corda/node/services/messaging/ArtemisMessagingTests.kt

@@ -6,11 +6,13 @@ import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
 import com.google.common.util.concurrent.SettableFuture
 import com.typesafe.config.ConfigFactory.empty
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.messaging.Message
 import net.corda.core.messaging.RPCOps
 import net.corda.core.messaging.createMessage
 import net.corda.core.node.services.DEFAULT_SESSION_ID
+import net.corda.core.utilities.ALICE
 import net.corda.core.utilities.LogHelper
 import net.corda.node.services.RPCUserService
 import net.corda.node.services.RPCUserServiceImpl
@@ -73,7 +75,7 @@ class ArtemisMessagingTests {
         userService = RPCUserServiceImpl(emptyList())
         config = TestNodeConfiguration(
                 baseDirectory = baseDirectory,
-                myLegalName = "me",
+                myLegalName = ALICE.name,
                 networkMapService = null)
         LogHelper.setLevel(PersistentUniquenessProvider::class)
         val dataSourceAndDatabase = configureDatabase(makeTestDataSourceProperties())

node/src/test/kotlin/net/corda/node/services/network/AbstractNetworkMapServiceTest.kt

@@ -10,6 +10,7 @@ import net.corda.core.node.services.ServiceInfo
 import net.corda.core.serialization.deserialize
 import net.corda.core.utilities.ALICE
 import net.corda.core.utilities.BOB
+import net.corda.core.utilities.CHARLIE
 import net.corda.flows.sendRequest
 import net.corda.node.services.config.NodeConfiguration
 import net.corda.node.services.network.AbstractNetworkMapServiceTest.Changed.Added
@@ -141,7 +142,7 @@ abstract class AbstractNetworkMapServiceTest<out S : AbstractNetworkMapService>
         val updates = alice.subscribe()
         val bob = addNewNodeToNetworkMap(BOB.name)
         alice.unsubscribe()
-        addNewNodeToNetworkMap("Charlie")
+        addNewNodeToNetworkMap(CHARLIE.name)
         swizzle()
         assertThat(updates.map { it.wireReg.verified().toChanged() }).containsOnly(Added(bob.info))
     }
@@ -274,4 +275,4 @@ abstract class AbstractNetworkMapServiceTest<out S : AbstractNetworkMapService>
             }
         }
     }
-}
+}

node/src/test/kotlin/net/corda/node/services/network/InMemoryIdentityServiceTests.kt

@@ -1,6 +1,7 @@
 package net.corda.node.services.network
 
 import net.corda.core.crypto.Party
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
 import net.corda.node.services.identity.InMemoryIdentityService
 import net.corda.core.utilities.ALICE
@@ -50,9 +51,10 @@ class InMemoryIdentityServiceTests {
     @Test
     fun `get identity by name`() {
         val service = InMemoryIdentityService()
-        val identities = listOf("Node A", "Node B", "Node C").map { Party(it, generateKeyPair().public) }
+        val identities = listOf("Node A", "Node B", "Node C")
+                .map { Party("CN=$it,O=R3,OU=corda,L=London,C=UK", generateKeyPair().public) }
         assertNull(service.partyFromName(identities.first().name))
         identities.forEach { service.registerIdentity(it) }
         identities.forEach { assertEquals(it, service.partyFromName(it.name)) }
     }
-}
+}

node/src/test/kotlin/net/corda/node/services/network/InMemoryNetworkMapCacheTest.kt

@@ -2,6 +2,8 @@ package net.corda.node.services.network
 
 import net.corda.core.getOrThrow
 import net.corda.core.node.services.ServiceInfo
+import net.corda.core.utilities.ALICE
+import net.corda.core.utilities.BOB
 import net.corda.node.utilities.transaction
 import net.corda.testing.node.MockNetwork
 import org.junit.Test
@@ -22,8 +24,8 @@ class InMemoryNetworkMapCacheTest {
     @Test
     fun `key collision`() {
         val entropy = BigInteger.valueOf(24012017L)
-        val nodeA = network.createNode(null, -1, MockNetwork.DefaultFactory, true, "Node A", null, entropy, ServiceInfo(NetworkMapService.type))
+        val nodeA = network.createNode(null, -1, MockNetwork.DefaultFactory, true, ALICE.name, null, entropy, ServiceInfo(NetworkMapService.type))
-        val nodeB = network.createNode(null, -1, MockNetwork.DefaultFactory, true, "Node B", null, entropy, ServiceInfo(NetworkMapService.type))
+        val nodeB = network.createNode(null, -1, MockNetwork.DefaultFactory, true, BOB.name, null, entropy, ServiceInfo(NetworkMapService.type))
         assertEquals(nodeA.info.legalIdentity, nodeB.info.legalIdentity)
 
         // Node A currently knows only about itself, so this returns node A

node/src/test/kotlin/net/corda/node/services/statemachine/StateMachineManagerTests.kt

@@ -8,6 +8,7 @@ import net.corda.core.*
 import net.corda.core.contracts.DOLLARS
 import net.corda.core.contracts.DummyState
 import net.corda.core.crypto.Party
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.flows.FlowException
 import net.corda.core.flows.FlowLogic
@@ -73,12 +74,12 @@ class StateMachineManagerTests {
         node1 = nodes.first
         node2 = nodes.second
         val notaryKeyPair = generateKeyPair()
-        val notaryService = ServiceInfo(ValidatingNotaryService.type, "notary-service-2000")
+        val notaryService = ServiceInfo(ValidatingNotaryService.type, "CN=notary-service-2000,O=R3,OU=corda,L=London,C=UK")
         val overrideServices = mapOf(Pair(notaryService, notaryKeyPair))
         // Note that these notaries don't operate correctly as they don't share their state. They are only used for testing
         // service addressing.
-        notary1 = net.createNotaryNode(networkMapAddr = node1.services.myInfo.address, overrideServices = overrideServices, serviceName = "notary-service-2000")
+        notary1 = net.createNotaryNode(networkMapAddr = node1.services.myInfo.address, overrideServices = overrideServices, serviceName = notaryService.name)
-        notary2 = net.createNotaryNode(networkMapAddr = node1.services.myInfo.address, overrideServices = overrideServices, serviceName = "notary-service-2000")
+        notary2 = net.createNotaryNode(networkMapAddr = node1.services.myInfo.address, overrideServices = overrideServices, serviceName = notaryService.name)
 
         net.messagingNetwork.receivedMessages.toSessionTransfers().forEach { sessionTransfers += it }
         net.runNetwork()

node/src/test/kotlin/net/corda/node/utilities/registration/NetworkisRegistrationHelperTest.kt

@@ -6,6 +6,7 @@ import com.nhaarman.mockito_kotlin.mock
 import net.corda.core.crypto.SecureHash
 import net.corda.core.crypto.X509Utilities
 import net.corda.core.exists
+import net.corda.core.utilities.ALICE
 import net.corda.testing.TestNodeConfiguration
 import org.junit.Rule
 import org.junit.Test
@@ -34,7 +35,7 @@ class NetworkRegistrationHelperTest {
 
         val config = TestNodeConfiguration(
                 baseDirectory = tempFolder.root.toPath(),
-                myLegalName = "me",
+                myLegalName = ALICE.name,
                 networkMapService = null)
 
         assertFalse(config.keyStoreFile.exists())

samples/attachment-demo/build.gradle

@@ -55,9 +55,9 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     ext.rpcUsers = [['username': "demo", 'password': "demo", 'permissions': ["StartFlow.net.corda.flows.FinalityFlow"]]]
 
     directory "./build/nodes"
-    networkMap "Controller"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Controller"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices["corda.notary.validating"]
         p2pPort 10002
@@ -66,7 +66,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         rpcUsers = ext.rpcUsers
     }
     node {
-        name "Bank A"
+        name "CN=Bank A,O=Bank A,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10005
@@ -75,7 +75,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         rpcUsers = ext.rpcUsers
     }
     node {
-        name "Bank B"
+        name "CN=Bank B,O=Bank B,L=New York,C=USA"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10008

samples/attachment-demo/src/main/kotlin/net/corda/attachmentdemo/AttachmentDemo.kt

@@ -13,6 +13,7 @@ import net.corda.core.getOrThrow
 import net.corda.core.messaging.CordaRPCOps
 import net.corda.core.messaging.startTrackedFlow
 import net.corda.core.sizedInputStreamAndHash
+import net.corda.core.utilities.DUMMY_BANK_B
 import net.corda.core.utilities.DUMMY_NOTARY
 import net.corda.core.utilities.DUMMY_NOTARY_KEY
 import net.corda.core.utilities.Emoji
@@ -66,7 +67,7 @@ fun sender(rpc: CordaRPCOps, numOfClearBytes: Int = 1024) { // default size 1K.
 
 fun sender(rpc: CordaRPCOps, inputStream: InputStream, hash: SecureHash.SHA256) {
     // Get the identity key of the other side (the recipient).
-    val otherSide: Party = rpc.partyFromName("Bank B")!!
+    val otherSide: Party = rpc.partyFromName(DUMMY_BANK_B.name) ?: throw IllegalStateException("Could not find counterparty \"${DUMMY_BANK_B.name}\"")
 
     // Make sure we have the file in storage
     if (!rpc.attachmentExists(hash)) {
@@ -133,4 +134,4 @@ class AttachmentContract : Contract {
         override val contract: Contract = AttachmentContract()
         override val participants: List<PublicKey> = emptyList()
     }
-}
+}

samples/bank-of-corda-demo/README.md

@@ -44,7 +44,7 @@ The RPC API requires a client to pass in user credentials:
     client.start("bankUser","test")
 which are validated on the Bank of Corda node against those configured at node startup:
     User("bankUser", "test", permissions = setOf(startFlowPermission<IssuerFlow.IssuanceRequester>()))
-    startNode("BankOfCorda", rpcUsers = listOf(user))
+    startNode(BOC.name, rpcUsers = listOf(user))
 
 Notary
 We are using a [SimpleNotaryService] in this example, but could easily switch to a [ValidatingNotaryService]

samples/bank-of-corda-demo/build.gradle

@@ -52,9 +52,9 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     // This name "Notary" is hard-coded into BankOfCordaClientApi so if you change it here, change it there too.
     // In this demo the node that runs a standalone notary also acts as the network map server.
-    networkMap "Notary"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Notary"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating"]
         p2pPort 10002
@@ -62,8 +62,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = []
     }
     node {
-        name "BankOfCorda"
+        name "CN=BankOfCorda,O=R3,OU=corda,L=New York,C=USA"
-        nearestCity "London"
+        nearestCity "New York"
         advertisedServices = ["corda.issuer.USD"]
         p2pPort 10005
         rpcPort 10006
@@ -77,7 +77,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         ]
     }
     node {
-        name "BigCorporation"
+        name "CN=BigCorporation,O=R3,OU=corda,L=London,C=UK"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10008

samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaHttpAPITest.kt

@@ -16,10 +16,10 @@ class BankOfCordaHttpAPITest {
         driver(dsl = {
             val (nodeBankOfCorda) = Futures.allAsList(
                     startNode(BOC.name, setOf(ServiceInfo(SimpleNotaryService.type))),
-                    startNode("BigCorporation")
+                    startNode(BIGCORP_LEGAL_NAME)
             ).getOrThrow()
             val nodeBankOfCordaApiAddr = startWebserver(nodeBankOfCorda).getOrThrow().listenAddress
-            assert(BankOfCordaClientApi(nodeBankOfCordaApiAddr).requestWebIssue(IssueRequestParams(1000, "USD", "BigCorporation", "1", BOC.name)))
+            assert(BankOfCordaClientApi(nodeBankOfCordaApiAddr).requestWebIssue(IssueRequestParams(1000, "USD", BIGCORP_LEGAL_NAME, "1", BOC.name)))
         }, isDebug = true)
     }
 }

samples/bank-of-corda-demo/src/integration-test/kotlin/net/corda/bank/BankOfCordaRPCClientTest.kt

@@ -21,7 +21,7 @@ class BankOfCordaRPCClientTest {
             val bigCorpCFO = User("bigCorpCFO", "password2", permissions = emptySet())
             val (nodeBankOfCorda, nodeBigCorporation) = Futures.allAsList(
                     startNode(BOC.name, setOf(ServiceInfo(SimpleNotaryService.type)), listOf(bocManager)),
-                    startNode("BigCorporation", rpcUsers = listOf(bigCorpCFO))
+                    startNode(BIGCORP_LEGAL_NAME, rpcUsers = listOf(bigCorpCFO))
             ).getOrThrow()
 
             // Bank of Corda RPC Client

samples/bank-of-corda-demo/src/main/kotlin/net/corda/bank/BankOfCordaDriver.kt

@@ -4,6 +4,7 @@ import com.google.common.net.HostAndPort
 import joptsimple.OptionParser
 import net.corda.bank.api.BankOfCordaClientApi
 import net.corda.bank.api.BankOfCordaWebApi.IssueRequestParams
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.node.services.ServiceInfo
 import net.corda.core.node.services.ServiceType
 import net.corda.core.transactions.SignedTransaction
@@ -27,6 +28,8 @@ fun main(args: Array<String>) {
 val BANK_USERNAME = "bankUser"
 val BIGCORP_USERNAME = "bigCorpUser"
 
+val BIGCORP_LEGAL_NAME = "CN=BigCorporation,O=R3,OU=corda,L=London,C=UK"
+
 private class BankOfCordaDriver {
     enum class Role {
         ISSUE_CASH_RPC,
@@ -57,13 +60,13 @@ private class BankOfCordaDriver {
                 val bigCorpUser = User(BIGCORP_USERNAME, "test", permissions = setOf(startFlowPermission<CashPaymentFlow>()))
                 startNode(DUMMY_NOTARY.name, setOf(ServiceInfo(SimpleNotaryService.type)))
                 val bankOfCorda = startNode(BOC.name, rpcUsers = listOf(bankUser), advertisedServices = setOf(ServiceInfo(ServiceType.corda.getSubType("issuer.USD"))))
-                startNode("BigCorporation", rpcUsers = listOf(bigCorpUser))
+                startNode(BIGCORP_LEGAL_NAME, rpcUsers = listOf(bigCorpUser))
                 startWebserver(bankOfCorda.get())
                 waitForAllNodesToFinish()
             }, isDebug = true)
         } else {
             try {
-                val requestParams = IssueRequestParams(options.valueOf(quantity), options.valueOf(currency), "BigCorporation", "1", "BankOfCorda")
+                val requestParams = IssueRequestParams(options.valueOf(quantity), options.valueOf(currency), BIGCORP_LEGAL_NAME, "1", BOC.name)
                 when (role) {
                     Role.ISSUE_CASH_RPC -> {
                         println("Requesting Cash via RPC ...")

samples/irs-demo/build.gradle

@@ -57,9 +57,9 @@ dependencies {
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
-    networkMap "Notary"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Notary"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating", "corda.interest_rates"]
         p2pPort 10002
@@ -69,7 +69,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         useTestClock true
     }
     node {
-        name "Bank A"
+        name "CN=Bank A,O=Bank A,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10005
@@ -79,7 +79,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         useTestClock true
     }
     node {
-        name "Bank B"
+        name "CN=Bank B,O=Bank B,L=New York,C=USA"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10008

samples/irs-demo/src/main/kotlin/net/corda/simulation/Simulation.kt

@@ -2,6 +2,7 @@ package net.corda.simulation
 
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.flatMap
 import net.corda.core.flows.FlowLogic
 import net.corda.core.messaging.SingleMessageRecipient
@@ -70,7 +71,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             val cfg = TestNodeConfiguration(
                     baseDirectory = config.baseDirectory,
                     // TODO: Set this back to "Bank of $city" after video day.
-                    myLegalName = "Bank $letter",
+                    myLegalName = "CN=Bank $letter,O=Bank $letter,L=city",
                     nearestCity = city,
                     networkMapService = null)
             return SimulatedNode(cfg, network, networkMapAddr, advertisedServices, id, overrideServices, entropyRoot)
@@ -121,7 +122,8 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             require(advertisedServices.containsType(NodeInterestRates.type))
             val cfg = TestNodeConfiguration(
                     baseDirectory = config.baseDirectory,
-                    myLegalName = "Rates Service Provider",
+                    // TODO: Make a more realistic legal name
+                    myLegalName = "CN=Rates Service Provider,O=R3,OU=corda,L=London,C=UK",
                     nearestCity = "Madrid",
                     networkMapService = null)
             return object : SimulatedNode(cfg, network, networkMapAddr, advertisedServices, id, overrideServices, entropyRoot) {
@@ -144,7 +146,8 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
                             entropyRoot: BigInteger): MockNetwork.MockNode {
             val cfg = TestNodeConfiguration(
                     baseDirectory = config.baseDirectory,
-                    myLegalName = "Regulator A",
+                    // TODO: Make a more realistic legal name
+                    myLegalName = "Regulator A,O=R3,OU=corda,L=London,C=UK",
                     nearestCity = "Paris",
                     networkMapService = null)
             return object : SimulatedNode(cfg, network, networkMapAddr, advertisedServices, id, overrideServices, entropyRoot) {

samples/irs-demo/src/main/resources/example-irs-trade.json

@@ -1,6 +1,6 @@
 {
   "fixedLeg": {
-    "fixedRatePayer": "Bank A",
+    "fixedRatePayer": "CN=Bank A,O=Bank A,L=London,C=UK",
     "notional": "€25000000",
     "paymentFrequency": "SemiAnnual",
     "effectiveDate": "2016-03-11",
@@ -22,7 +22,7 @@
     "interestPeriodAdjustment": "Adjusted"
   },
   "floatingLeg": {
-    "floatingRatePayer": "Bank B",
+    "floatingRatePayer": "CN=Bank B,O=Bank B,L=New York,C=USA",
     "notional": "€25000000",
     "paymentFrequency": "Quarterly",
     "effectiveDate": "2016-03-11",

samples/irs-demo/src/main/resources/irsweb/js/viewmodel/FixedLeg.js

@@ -2,7 +2,7 @@
 
 define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
     return {
-        fixedRatePayer: "Bank A",
+        fixedRatePayer: "CN=Bank A,O=Bank A,L=London,C=UK",
         notional: {
             quantity: 2500000000
         },
@@ -17,4 +17,4 @@ define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
         paymentDelay: "0",
         interestPeriodAdjustment: "Adjusted"
     };
-});
+});

samples/irs-demo/src/main/resources/irsweb/js/viewmodel/FloatingLeg.js

@@ -2,7 +2,7 @@
 
 define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
     return {
-        floatingRatePayer: "Bank B",
+        floatingRatePayer: "CN=Bank B,O=Bank B,L=New York,C=USA",
         notional: {
            quantity: 2500000000
         },
@@ -25,4 +25,4 @@ define(['utils/dayCountBasisLookup'], (dayCountBasisLookup) => {
            name: "3M"
         }
     };
-});
+});

samples/irs-demo/src/test/kotlin/net/corda/irs/testing/NodeInterestRatesTest.kt

@@ -8,6 +8,7 @@ import net.corda.core.bd
 import net.corda.core.contracts.*
 import net.corda.core.crypto.MerkleTreeException
 import net.corda.core.crypto.Party
+import net.corda.core.crypto.X509Utilities
 import net.corda.core.crypto.generateKeyPair
 import net.corda.core.getOrThrow
 import net.corda.core.node.services.ServiceInfo
@@ -47,7 +48,7 @@ class NodeInterestRatesTest {
         """.trimIndent())
 
     val DUMMY_CASH_ISSUER_KEY = generateKeyPair()
-    val DUMMY_CASH_ISSUER = Party("Cash issuer", DUMMY_CASH_ISSUER_KEY.public)
+    val DUMMY_CASH_ISSUER = Party("CN=Cash issuer,O=R3,OU=corda,L=London,C=UK", DUMMY_CASH_ISSUER_KEY.public)
 
     val clock = Clock.systemUTC()
     lateinit var oracle: NodeInterestRates.Oracle

samples/raft-notary-demo/build.gradle

@@ -75,9 +75,9 @@ task generateNotaryIdentity(type: JavaExec) {
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateNotaryIdentity']) {
     directory deployTo
-    networkMap "Notary 1"
+    networkMap "CN=Notary 1,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Party"
+        name "CN=Party,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10002
@@ -89,7 +89,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateN
         ]]]
     }
     node {
-        name "Counterparty"
+        name "CN=Counterparty,O=R3,OU=corda,L=London,C=UK"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10005
@@ -97,7 +97,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateN
         cordapps = []
     }
     node {
-        name "Notary 1"
+        name "CN=Notary 1,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = [advertisedNotary]
         p2pPort 10008
@@ -106,7 +106,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateN
         notaryNodePort 11002
     }
     node {
-        name "Notary 2"
+        name "CN=Notary 2,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = [advertisedNotary]
         p2pPort 10011
@@ -116,7 +116,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar', 'generateN
         notaryClusterAddresses = ["localhost:11002"]
     }
     node {
-        name "Notary 3"
+        name "CN=Notary 3,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = [advertisedNotary]
         p2pPort 10014

samples/simm-valuation-demo/build.gradle

@@ -68,16 +68,16 @@ dependencies {
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
-    networkMap "Controller"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Controller"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating"]
         p2pPort 10002
         cordapps = []
     }
     node {
-        name "Bank A"
+        name "CN=Bank A,O=Bank A,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10004
@@ -85,7 +85,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = []
     }
     node {
-        name "Bank B"
+        name "CN=Bank B,O=Bank B,L=New York,C=USA"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10006
@@ -93,8 +93,8 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = []
     }
     node {
-        name "Bank C"
+        name "CN=Bank C,O=Bank C,L=Tokyo,C=Japan"
-        nearestCity "tokyo"
+        nearestCity "Tokyo"
         advertisedServices = []
         p2pPort 10008
         webPort 10009

samples/simm-valuation-demo/src/main/resources/simmvaluationweb/app/viewmodel/FixedLegViewModel.js

@@ -1,7 +1,7 @@
 "use strict";
 var FixedLegViewModel = (function () {
     function FixedLegViewModel() {
-        this.fixedRatePayer = "Bank A";
+        this.fixedRatePayer = "CN=Bank A,O=Bank A,L=London,C=UK";
         this.notional = {
             quantity: 2500000000
         };
@@ -17,4 +17,4 @@ var FixedLegViewModel = (function () {
     return FixedLegViewModel;
 }());
 exports.FixedLegViewModel = FixedLegViewModel;
-//# sourceMappingURL=FixedLegViewModel.js.map
+//# sourceMappingURL=FixedLegViewModel.js.map

samples/simm-valuation-demo/src/main/resources/simmvaluationweb/app/viewmodel/FloatingLegViewModel.js

@@ -1,7 +1,7 @@
 "use strict";
 var FloatingLegViewModel = (function () {
     function FloatingLegViewModel() {
-        this.floatingRatePayer = "Bank B";
+        this.floatingRatePayer = "CN=Bank B,O=Bank B,L=New York,C=USA";
         this.notional = {
             quantity: 2500000000
         };
@@ -25,4 +25,4 @@ var FloatingLegViewModel = (function () {
     return FloatingLegViewModel;
 }());
 exports.FloatingLegViewModel = FloatingLegViewModel;
-//# sourceMappingURL=FloatingLegViewModel.js.map
+//# sourceMappingURL=FloatingLegViewModel.js.map

samples/simm-valuation-demo/src/main/web/src/app/viewmodel/FloatingLegViewModel.ts

@@ -1,7 +1,7 @@
 export class FloatingLegViewModel {
   constructor() { }
 
-  floatingRatePayer = "Bank B";
+  floatingRatePayer = "CN=Bank B,O=Bank B,L=New York,C=USA";
   notional: Object = {
      quantity: 2500000000
   };

samples/trader-demo/build.gradle

@@ -68,16 +68,16 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
     directory "./build/nodes"
     // This name "Notary" is hard-coded into TraderDemoClientApi so if you change it here, change it there too.
     // In this demo the node that runs a standalone notary also acts as the network map server.
-    networkMap "Notary"
+    networkMap "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
     node {
-        name "Notary"
+        name "CN=Notary Service,O=R3,OU=corda,L=London,C=UK"
         nearestCity "London"
         advertisedServices = ["corda.notary.validating"]
         p2pPort 10002
         cordapps = []
     }
     node {
-        name "Bank A"
+        name "CN=Bank A,O=Bank A,L=London,C=UK"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10005
@@ -86,7 +86,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         rpcUsers = ext.rpcUsers
     }
     node {
-        name "Bank B"
+        name "CN=Bank B,O=Bank B,L=New York,C=USA"
         nearestCity "New York"
         advertisedServices = []
         p2pPort 10008
@@ -95,7 +95,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         rpcUsers = ext.rpcUsers
     }
     node {
-        name "BankOfCorda"
+        name "CN=BankOfCorda,O=R3,OU=corda,L=New York,C=USA"
         nearestCity "London"
         advertisedServices = []
         p2pPort 10011

samples/trader-demo/src/main/kotlin/net/corda/traderdemo/TraderDemo.kt

@@ -48,7 +48,7 @@ private class TraderDemo {
         } else {
             val host = HostAndPort.fromString("localhost:10009")
             CordaRPCClient(host).use("demo", "demo") {
-                TraderDemoClientApi(this).runSeller(1000.DOLLARS, "Bank A")
+                TraderDemoClientApi(this).runSeller(1000.DOLLARS, "CN=Bank A,O=Bank A,L=London,C=UK")
             }
         }
     }

samples/trader-demo/src/main/kotlin/net/corda/traderdemo/flow/SellerFlow.kt

@@ -4,12 +4,15 @@ import co.paralleluniverse.fibers.Suspendable
 import net.corda.contracts.CommercialPaper
 import net.corda.contracts.asset.DUMMY_CASH_ISSUER
 import net.corda.core.contracts.*
-import net.corda.core.crypto.*
+import net.corda.core.crypto.Party
+import net.corda.core.crypto.SecureHash
+import net.corda.core.crypto.generateKeyPair
 import net.corda.core.days
 import net.corda.core.flows.FlowLogic
 import net.corda.core.node.NodeInfo
 import net.corda.core.seconds
 import net.corda.core.transactions.SignedTransaction
+import net.corda.core.utilities.DUMMY_BANK_C
 import net.corda.core.utilities.ProgressTracker
 import net.corda.flows.NotaryFlow
 import net.corda.flows.TwoPartyTradeFlow
@@ -63,7 +66,7 @@ class SellerFlow(val otherParty: Party,
     fun selfIssueSomeCommercialPaper(ownedBy: PublicKey, notaryNode: NodeInfo): StateAndRef<CommercialPaper.State> {
         // Make a fake company that's issued its own paper.
         val keyPair = generateKeyPair()
-        val party = Party("Bank of London", keyPair.public)
+        val party = Party(DUMMY_BANK_C.name, keyPair.public)
 
         val issuance: SignedTransaction = run {
             val tx = CommercialPaper().generateIssue(party.ref(1, 2, 3), 1100.DOLLARS `issued by` DUMMY_CASH_ISSUER,

test-utils/src/main/kotlin/net/corda/testing/CoreTestUtils.kt

@@ -71,7 +71,7 @@ val MINI_CORP: Party get() = Party("MiniCorp", MINI_CORP_PUBKEY)
 
 val BOC_KEY: KeyPair by lazy { generateKeyPair() }
 val BOC_PUBKEY: PublicKey get() = BOC_KEY.public
-val BOC: Party get() = Party("BankOfCorda", BOC_PUBKEY)
+val BOC: Party get() = Party("CN=BankOfCorda,O=R3,OU=corda,L=New York,C=USA", BOC_PUBKEY)
 val BOC_PARTY_REF = BOC.ref(OpaqueBytes.of(1)).reference
 
 val BIG_CORP_KEY: KeyPair by lazy { generateKeyPair() }

tools/demobench/src/test/kotlin/net/corda/demobench/model/NodeConfigTest.kt

@@ -160,7 +160,7 @@ class NodeConfigTest {
                 + "\"h2port\":30001,"
                 + "\"myLegalName\":\"MyName\","
                 + "\"nearestCity\":\"Stockholm\","
-                + "\"networkMapService\":{\"address\":\"localhost:12345\",\"legalName\":\"NotaryService\"},"
+                + "\"networkMapService\":{\"address\":\"localhost:12345\",\"legalName\":\"CN=NotaryService,O=R3,OU=corda,L=London,C=UK\"},"
                 + "\"p2pAddress\":\"localhost:10001\","
                 + "\"rpcAddress\":\"localhost:40002\","
                 + "\"rpcUsers\":["