diff --git a/src/mollie/callback.php b/src/mollie/callback.php
index 338b5ce..d4cd4c0 100644
--- a/src/mollie/callback.php
+++ b/src/mollie/callback.php
@@ -29,7 +29,7 @@
 
     $transaction = mysql_fetch_assoc($transactionQuery);
 
-    $_GATEWAY = getGatewayVariables('mollie' . $transaction['method']);
+    $_GATEWAY = getGatewayVariables('mollie' . $transaction['method'] . '_devapp');
 
     if ($transaction['status'] != 'open') {
         logTransaction($_GATEWAY['paymentmethod'], array_merge($transaction, $_POST), 'Callback - Failure 3 (Transaction not open)');
diff --git a/src/molliemistercash.php b/src/molliebancontact_devapp.php
old mode 100755
new mode 100644
similarity index 75%
rename from src/molliemistercash.php
rename to src/molliebancontact_devapp.php
index 08a225a..5828343
--- a/src/molliemistercash.php
+++ b/src/molliebancontact_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliemistercash_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Bancontact'
-		)
-	));
-
-	return $config;
-}
-
-function molliemistercash_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::MISTERCASH);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebancontact_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Bancontact'
+		)
+	));
+
+	return $config;
+}
+
+function molliebancontact_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::MISTERCASH);
+}
diff --git a/src/molliebanktransfer.php b/src/molliebanktransfer_devapp.php
old mode 100755
new mode 100644
similarity index 75%
rename from src/molliebanktransfer.php
rename to src/molliebanktransfer_devapp.php
index 5396a7a..3c51a31
--- a/src/molliebanktransfer.php
+++ b/src/molliebanktransfer_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliebanktransfer_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Bank Transfer'
-		)
-	));
-
-	return $config;
-}
-
-function molliebanktransfer_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::BANKTRANSFER);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebanktransfer_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Bank Transfer'
+		)
+	));
+
+	return $config;
+}
+
+function molliebanktransfer_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::BANKTRANSFER);
+}
diff --git a/src/molliebelfius.php b/src/molliebelfius_devapp.php
old mode 100755
new mode 100644
similarity index 76%
rename from src/molliebelfius.php
rename to src/molliebelfius_devapp.php
index 74af4c5..fc7cc5d
--- a/src/molliebelfius.php
+++ b/src/molliebelfius_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliebelfius_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Belfius'
-		)
-	));
-
-	return $config;
-}
-
-function molliebelfius_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::BELFIUS);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebelfius_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Belfius'
+		)
+	));
+
+	return $config;
+}
+
+function molliebelfius_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::BELFIUS);
+}
diff --git a/src/molliebitcoin.php b/src/molliebitcoin_devapp.php
old mode 100755
new mode 100644
similarity index 76%
rename from src/molliebitcoin.php
rename to src/molliebitcoin_devapp.php
index 5f84cb8..5df597f
--- a/src/molliebitcoin.php
+++ b/src/molliebitcoin_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliebitcoin_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Bitcoin'
-		)
-	));
-
-	return $config;
-}
-
-function molliebitcoin_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::BITCOIN);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebitcoin_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Bitcoin'
+		)
+	));
+
+	return $config;
+}
+
+function molliebitcoin_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::BITCOIN);
+}
diff --git a/src/molliecreditcard.php b/src/molliecreditcard_devapp.php
old mode 100755
new mode 100644
similarity index 75%
rename from src/molliecreditcard.php
rename to src/molliecreditcard_devapp.php
index a68fe31..7260c79
--- a/src/molliecreditcard.php
+++ b/src/molliecreditcard_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliecreditcard_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Creditcard'
-		)
-	));
-
-	return $config;
-}
-
-function molliecreditcard_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::CREDITCARD);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliecreditcard_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Creditcard'
+		)
+	));
+
+	return $config;
+}
+
+function molliecreditcard_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::CREDITCARD);
+}
diff --git a/src/molliepaypal.php b/src/molliepaypal_devapp.php
old mode 100755
new mode 100644
similarity index 76%
rename from src/molliepaypal.php
rename to src/molliepaypal_devapp.php
index 37f3924..996eb5e
--- a/src/molliepaypal.php
+++ b/src/molliepaypal_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliepaypal_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie PayPal'
-		)
-	));
-
-	return $config;
-}
-
-function molliepaypal_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::PAYPAL);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliepaypal_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie PayPal'
+		)
+	));
+
+	return $config;
+}
+
+function molliepaypal_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::PAYPAL);
+}
diff --git a/src/molliepaysafecard.php b/src/molliepaysafecard_devapp.php
old mode 100755
new mode 100644
similarity index 75%
rename from src/molliepaysafecard.php
rename to src/molliepaysafecard_devapp.php
index 55b9cb7..b8d1a4c
--- a/src/molliepaysafecard.php
+++ b/src/molliepaysafecard_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliepaysafecard_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Paysafecard'
-		)
-	));
-
-	return $config;
-}
-
-function molliepaysafecard_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::PAYSAFECARD);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliepaysafecard_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Paysafecard'
+		)
+	));
+
+	return $config;
+}
+
+function molliepaysafecard_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::PAYSAFECARD);
+}
diff --git a/src/molliesofort.php b/src/molliesofort_devapp.php
old mode 100755
new mode 100644
similarity index 76%
rename from src/molliesofort.php
rename to src/molliesofort_devapp.php
index f947bce..e5f0a32
--- a/src/molliesofort.php
+++ b/src/molliesofort_devapp.php
@@ -1,20 +1,20 @@
-<?php
-
-require_once __DIR__ . '/mollie/mollie.php';
-
-function molliesofort_config() {
-	$config = mollie_config();
-
-	$config = array_merge($config, array(
-		'FriendlyName' => array(
-			'Type' => 'System',
-			'Value'=> 'Mollie Sofort Banking'
-		)
-	));
-
-	return $config;
-}
-
-function molliesofort_link($params) {
-	return mollie_link($params, Mollie_API_Object_Method::SOFORT);
-}
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliesofort_devapp_config() {
+	$config = mollie_config();
+
+	$config = array_merge($config, array(
+		'FriendlyName' => array(
+			'Type' => 'System',
+			'Value'=> 'Mollie Sofort Banking'
+		)
+	));
+
+	return $config;
+}
+
+function molliesofort_devapp_link($params) {
+	return mollie_link($params, Mollie_API_Object_Method::SOFORT);
+}