diff --git a/app/Fee.php b/app/Fee.php
index e0d29e23..0f5b8430 100644
--- a/app/Fee.php
+++ b/app/Fee.php
@@ -6,6 +6,6 @@ use Illuminate\Database\Eloquent\Model;
 
 class Fee extends Model
 {
-    public $fillable = ['title', 'nami_id'];
+    public $fillable = ['name', 'nami_id'];
     public $timestamps = false;
 }
diff --git a/app/Initialize/InitializeFees.php b/app/Initialize/InitializeFees.php
index 5039883b..b54d2629 100644
--- a/app/Initialize/InitializeFees.php
+++ b/app/Initialize/InitializeFees.php
@@ -14,9 +14,8 @@ class InitializeFees {
 
     public function handle() {
         $this->bar->task('Synchronisiere Beiträge', function() {
-            collect($this->api->fees()->data)->each(function($fee) {
-                $title = preg_replace('/^.*\((.*)\).*$/', '\\1', $fee->descriptor);
-                \App\Fee::create(['nami_id' => $fee->id, 'title' => $title]);
+            $this->api->group(auth()->user()->getNamiGroupId())->fees()->each(function($fee) {
+                \App\Fee::create(['nami_id' => $fee->id, 'name' => $fee->name]);
             });
         });
     }
diff --git a/app/Initialize/InitializeNationalities.php b/app/Initialize/InitializeNationalities.php
index 78a66e14..481999e4 100644
--- a/app/Initialize/InitializeNationalities.php
+++ b/app/Initialize/InitializeNationalities.php
@@ -14,8 +14,9 @@ class InitializeNationalities {
 
     public function handle() {
         $this->bar->task('Synchronisiere Nationalitäten', function() {
-            collect($this->api->nationalities()->data)->each(function($nationality) {
-                \App\Nationality::create(['nami_id' => $nationality->id, 'name' => $nationality->descriptor]);
+            $this->api->group(auth()->user()->getNamiGroupId())->fees();
+            $this->api->nationalities()->each(function($nationality) {
+                \App\Nationality::create(['nami_id' => $nationality->id, 'name' => $nationality->name]);
             });
         });
     }
diff --git a/database/migrations/2018_01_22_234145_create_fees_table.php b/database/migrations/2018_01_22_234145_create_fees_table.php
index b3876953..39454652 100644
--- a/database/migrations/2018_01_22_234145_create_fees_table.php
+++ b/database/migrations/2018_01_22_234145_create_fees_table.php
@@ -15,8 +15,8 @@ class CreateFeesTable extends Migration
     {
         Schema::create('fees', function (Blueprint $table) {
             $table->increments('id');
-			$table->string('title');
-			$table->integer('nami_id');
+            $table->string('name');
+            $table->integer('nami_id');
         });
     }