diff --git a/samples/simm-valuation-demo/build.gradle b/samples/simm-valuation-demo/build.gradle
index 16dd0242f7..8a974f1ab2 100644
--- a/samples/simm-valuation-demo/build.gradle
+++ b/samples/simm-valuation-demo/build.gradle
@@ -85,7 +85,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         cordapps = ["net.corda:finance:$corda_release_version"]
     }
     node {
-        name "O=Bank C,L=Tokyo,C=Japan"
+        name "O=Bank C,L=Tokyo,C=JP"
         advertisedServices = []
         p2pPort 10008
         webPort 10009
diff --git a/samples/simm-valuation-demo/src/main/web/src/app/app.component.ts b/samples/simm-valuation-demo/src/main/web/src/app/app.component.ts
index 6029a42e0c..822f7465c9 100644
--- a/samples/simm-valuation-demo/src/main/web/src/app/app.component.ts
+++ b/samples/simm-valuation-demo/src/main/web/src/app/app.component.ts
@@ -37,7 +37,7 @@ export class AppComponent {
     var name = x500Name;
     x500Name.split(',').forEach(function (element) {
         var keyValue = element.split('=');
-        if (keyValue[0].toUpperCase() == 'CN') {
+        if (keyValue[0].toUpperCase() == 'O') {
             name = keyValue[1];
         }
     });
@@ -49,10 +49,11 @@ export class AppComponent {
   ngOnInit() {
     this.httpWrapperService.getAbsolute("whoami").toPromise().then((data) => {
       this.whoAmI = this.renderX500Name(data.self.text);
+      var self = this;
       this.counterParties = data.counterparties.map(function (x) {
           return {
               id: x.id,
-              text: this.renderX500Name(x.text)
+              text: self.renderX500Name(x.text)
           };
       });
       if (this.counterParties.length == 0) {