diff --git a/composer.json b/composer.json
index 08c3dd3..318d1e7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "require": {
-    "mollie/mollie-api-php": "^2.0"
+    "mollie/mollie-api-php": "^3.7"
   },
   "config": {
     "vendor-dir": "src/mollie/vendor"
diff --git a/src/molliegiropay_devapp.php b/src/molliealma_devapp.php
similarity index 69%
rename from src/molliegiropay_devapp.php
rename to src/molliealma_devapp.php
index ab80fb3..6bbb829 100644
--- a/src/molliegiropay_devapp.php
+++ b/src/molliealma_devapp.php
@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function molliegiropay_devapp_config()
+function molliealma_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Giropay'
+            'Value' => 'Mollie Alma'
         )
     ));
 
     return $config;
 }
 
-function molliegiropay_devapp_link($params)
+function molliealma_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::GIROPAY);
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::ALMA);
 }
diff --git a/src/molliesofort_devapp.php b/src/molliebacs_devapp.php
similarity index 68%
rename from src/molliesofort_devapp.php
rename to src/molliebacs_devapp.php
index 052a74d..5ec24ed 100644
--- a/src/molliesofort_devapp.php
+++ b/src/molliebacs_devapp.php
@@ -2,21 +2,21 @@
 
 require_once __DIR__ . '/mollie/mollie.php';
 
-function molliesofort_devapp_config()
+function molliebacs_devapp_config()
 {
     $config = mollie_config();
 
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Sofort Banking'
+            'Value' => 'Mollie Bacs'
         )
     ));
 
     return $config;
 }
 
-function molliesofort_devapp_link($params)
+function molliebacs_devapp_link($params)
 {
-    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SOFORT);
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BACS);
 }
diff --git a/src/molliebancomatpay_devapp.php b/src/molliebancomatpay_devapp.php
new file mode 100644
index 0000000..9f12746
--- /dev/null
+++ b/src/molliebancomatpay_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebancomatpay_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie BANCOMAT Pay'
+        )
+    ));
+
+    return $config;
+}
+
+function molliebancomatpay_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BANCOMATPAY);
+}
diff --git a/src/molliebelfius_devapp.php b/src/molliebelfius_devapp.php
index 82234cf..32ddca7 100644
--- a/src/molliebelfius_devapp.php
+++ b/src/molliebelfius_devapp.php
@@ -9,7 +9,7 @@ function molliebelfius_devapp_config()
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie Belfius'
+            'Value' => 'Mollie Belfius Pay Button'
         )
     ));
 
diff --git a/src/molliebillie_devapp.php b/src/molliebillie_devapp.php
new file mode 100644
index 0000000..1bbea64
--- /dev/null
+++ b/src/molliebillie_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliebillie_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Billie'
+        )
+    ));
+
+    return $config;
+}
+
+function molliebillie_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BILLIE);
+}
diff --git a/src/mollieblik_devapp.php b/src/mollieblik_devapp.php
new file mode 100644
index 0000000..27882ab
--- /dev/null
+++ b/src/mollieblik_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieblik_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie BLIK'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieblik_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::BLIK);
+}
diff --git a/src/mollieideal_devapp.php b/src/mollieideal_devapp.php
index 5f36871..5fb78f5 100755
--- a/src/mollieideal_devapp.php
+++ b/src/mollieideal_devapp.php
@@ -9,7 +9,7 @@ function mollieideal_devapp_config()
     $config = array_merge($config, array(
         'FriendlyName' => array(
             'Type' => 'System',
-            'Value' => 'Mollie iDeal'
+            'Value' => 'Mollie iDEAL'
         )
     ));
 
diff --git a/src/molliein3_devapp.php b/src/molliein3_devapp.php
new file mode 100755
index 0000000..3f695ba
--- /dev/null
+++ b/src/molliein3_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliein3_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie iDEAL in3'
+        )
+    ));
+
+    return $config;
+}
+
+function molliein3_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::IN3);
+}
diff --git a/src/mollieklarna_devapp.php b/src/mollieklarna_devapp.php
new file mode 100644
index 0000000..46f9235
--- /dev/null
+++ b/src/mollieklarna_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarna_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarna_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA);
+}
diff --git a/src/mollieklarnapaylater_devapp.php b/src/mollieklarnapaylater_devapp.php
new file mode 100644
index 0000000..c906c31
--- /dev/null
+++ b/src/mollieklarnapaylater_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnapaylater_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Pay Later'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnapaylater_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_PAY_LATER);
+}
diff --git a/src/mollieklarnapaynow_devapp.php b/src/mollieklarnapaynow_devapp.php
new file mode 100644
index 0000000..5b44a74
--- /dev/null
+++ b/src/mollieklarnapaynow_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnapaynow_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Pay Now'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnapaynow_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_PAY_NOW);
+}
diff --git a/src/mollieklarnasliceit_devapp.php b/src/mollieklarnasliceit_devapp.php
new file mode 100644
index 0000000..6dfdadc
--- /dev/null
+++ b/src/mollieklarnasliceit_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieklarnasliceit_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Klarna Slice It'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieklarnasliceit_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::KLARNA_SLICE_IT);
+}
diff --git a/src/molliembway_devapp.php b/src/molliembway_devapp.php
new file mode 100644
index 0000000..af4dbcb
--- /dev/null
+++ b/src/molliembway_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliembway_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie MB Way'
+        )
+    ));
+
+    return $config;
+}
+
+function molliembway_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::MBWAY);
+}
diff --git a/src/molliemultibanco_devapp.php b/src/molliemultibanco_devapp.php
new file mode 100644
index 0000000..3d68417
--- /dev/null
+++ b/src/molliemultibanco_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliemultibanco_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Multibanco'
+        )
+    ));
+
+    return $config;
+}
+
+function molliemultibanco_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::MULTIBANCO);
+}
diff --git a/src/molliepaybybank_devapp.php b/src/molliepaybybank_devapp.php
new file mode 100644
index 0000000..dbc9879
--- /dev/null
+++ b/src/molliepaybybank_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliepaybybank_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Pay By Bank'
+        )
+    ));
+
+    return $config;
+}
+
+function molliepaybybank_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::PAYBYBANK);
+}
diff --git a/src/mollieriverty_devapp.php b/src/mollieriverty_devapp.php
new file mode 100644
index 0000000..3eb6afb
--- /dev/null
+++ b/src/mollieriverty_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieriverty_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Riverty'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieriverty_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::RIVERTY);
+}
diff --git a/src/molliesatispay_devapp.php b/src/molliesatispay_devapp.php
new file mode 100644
index 0000000..bbb7313
--- /dev/null
+++ b/src/molliesatispay_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function molliesatispay_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Satispay'
+        )
+    ));
+
+    return $config;
+}
+
+function molliesatispay_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SATISPAY);
+}
diff --git a/src/mollieswish_devapp.php b/src/mollieswish_devapp.php
new file mode 100644
index 0000000..43e7b51
--- /dev/null
+++ b/src/mollieswish_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollieswish_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Swish'
+        )
+    ));
+
+    return $config;
+}
+
+function mollieswish_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::SWISH);
+}
diff --git a/src/mollietrustly_devapp.php b/src/mollietrustly_devapp.php
new file mode 100644
index 0000000..75f9b50
--- /dev/null
+++ b/src/mollietrustly_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollietrustly_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie Trustly'
+        )
+    ));
+
+    return $config;
+}
+
+function mollietrustly_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::TRUSTLY);
+}
diff --git a/src/mollietwint_devapp.php b/src/mollietwint_devapp.php
new file mode 100644
index 0000000..e303d0e
--- /dev/null
+++ b/src/mollietwint_devapp.php
@@ -0,0 +1,22 @@
+<?php
+
+require_once __DIR__ . '/mollie/mollie.php';
+
+function mollietwint_devapp_config()
+{
+    $config = mollie_config();
+
+    $config = array_merge($config, array(
+        'FriendlyName' => array(
+            'Type' => 'System',
+            'Value' => 'Mollie TWINT'
+        )
+    ));
+
+    return $config;
+}
+
+function mollietwint_devapp_link($params)
+{
+    return mollie_link($params, \Mollie\Api\Types\PaymentMethod::TWINT);
+}