diff --git a/cart.html b/cart.html
index 24d0e9f..dddf339 100644
--- a/cart.html
+++ b/cart.html
@@ -58,7 +58,7 @@ <h4>
 							app (<a style="font-weight: 500;text-decoration: underline;" target="blank"
 								href="https://privacybydesign.foundation/download/">download</a> en
 							<a style="font-weight: 500;text-decoration: underline;" target="blank"
-								href="https://services.nijmegen.nl/irma/gemeente/start">vullen</a>) om
+								href="https://yivi.nijmegen.nl/login"">vullen</a>) om
 							op een privacy-vriendelijke manier aan te tonen dat je
 							oud genoeg bent om een van deze games te kopen.</span>
 					</h4>
diff --git a/css/style.css b/css/style.css
index f180824..0217be5 100644
--- a/css/style.css
+++ b/css/style.css
@@ -2388,7 +2388,7 @@ div#line1:hover span#b {
     padding: 0px;
   }
 
-  #irma-info {
+  #yivi-info {
     padding: 15px 0px 0px 0px !important;
     text-align: center !important;
   }
diff --git a/index.html b/index.html
index 96500c9..9359059 100644
--- a/index.html
+++ b/index.html
@@ -57,7 +57,7 @@ <h4>
 							oud genoeg bent om een van deze games te kopen.</span>
 					</h4>
 				</div>
-				<div id="irma-info" style="text-align: right; width: 30%; padding-top: 20px; padding-right: 25px;">
+				<div id="yivi-info" style="text-align: right; width: 30%; padding-top: 20px; padding-right: 25px;">
 					<h4><a target="blank" style="font-weight: 700;text-decoration: underline;"
 							href="http://www.yivi.app">Yivi?</a>
 
diff --git a/js/main.js b/js/main.js
index e9f4af5..51eb67c 100644
--- a/js/main.js
+++ b/js/main.js
@@ -94,7 +94,7 @@
 	if (location.pathname.includes('cart.html') && !sessionStorage.getItem('productid'))
 		location.href = 'index.html';
 
-	// Age verification with IRMA
+	// Age verification with Yivi
 	if ( window.yivi ) {
 		console.log("Age verification started");
 
@@ -102,20 +102,12 @@
 			element:   '#yivi-web-element',
 
 			session: {
-				url: '',
+				url: '..',
 				start: {
 					url: o => `start_session.php?type=` + sessionStorage.getItem('minage') + 'plus',
 				},
-				mapping: {
-					sessionPtr: pkg => {
-						return {
-							yiviqr: pkg.sessionPtr.yiviqr,
-							u: pkg.sessionPtr.u.replace(/https:\/\/(staging\.)?privacybydesign\.foundation/, "https://$1angrygames.nl")
-						};
-					},
-				},
 				result: {
-					url: (o, {sessionPtr, sessionToken}) => `${sessionPtr.u.split('/yivi')[0]}/session/${sessionToken}/result`,
+					url: (o, {sessionPtr, sessionToken}) => `${sessionPtr.u.split('/irma')[0]}/session/${sessionToken}/result`,
 				}
 			},
 
@@ -128,7 +120,7 @@
 			console.log("Session successful!");
 			console.log("Result:", data);
 			// Continue to order page if user is 18+
-			let attr = data.disclosed[0][0].rawvalue.toLowerCase();
+			let attr = daawvalue.toLowerCase();
 			if (attr === 'yes' || attr === 'ja') {
 				setTimeout(() => {
 					$('#phase-agecheck').hide();
@@ -145,7 +137,7 @@
 		let error = function (data) {
 			console.log("Session failed!");
 			console.log("Error data:", data);
-			$('#snackbar-content').html('Er is een fout opgetreden bij de leeftijdsverificatie via IRMA.');
+			$('#snackbar-content').html('Er is een fout opgetreden bij de leeftijdsverificatie via Yivi.');
 			$('#snackbar').addClass('show');
 		};
 
@@ -153,3 +145,4 @@
 	}
 
 })(jQuery);
+ta.disclosed[0][0].r
\ No newline at end of file