diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php
index 3b21b24cb3..78001f33f4 100644
--- a/app/Console/Commands/VerifyDatabase.php
+++ b/app/Console/Commands/VerifyDatabase.php
@@ -241,12 +241,12 @@ having transaction_count = 0
     private function reportSum()
     {
         /** @var UserRepositoryInterface $userRepository */
-        $userRepository = app('FireflyIII\Repositories\User\UserRepositoryInterface');
+        $userRepository = app(UserRepositoryInterface::class);
 
         /** @var User $user */
         foreach ($userRepository->all() as $user) {
             /** @var AccountRepositoryInterface $repository */
-            $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface', [$user]);
+            $repository = app(AccountRepositoryInterface::class, [$user]);
             $sum        = $repository->sumOfEverything();
             if (bccomp($sum, '0') !== 0) {
                 $this->error('Error: Transactions for user #' . $user->id . ' (' . $user->email . ') are off by ' . $sum . '!');
diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php
index e3882d6a62..563d3ff532 100644
--- a/app/Export/Collector/AttachmentCollector.php
+++ b/app/Export/Collector/AttachmentCollector.php
@@ -44,7 +44,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface
      */
     public function __construct(ExportJob $job)
     {
-        $this->repository = app('FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface');
+        /** @var AttachmentRepositoryInterface repository */
+        $this->repository = app(AttachmentRepositoryInterface::class);
         // make storage:
         $this->uploadDisk = Storage::disk('upload');
         $this->exportDisk = Storage::disk('export');
diff --git a/app/Export/Processor.php b/app/Export/Processor.php
index e364ed1373..3d3e3f2c48 100644
--- a/app/Export/Processor.php
+++ b/app/Export/Processor.php
@@ -11,6 +11,8 @@ declare(strict_types = 1);
 namespace FireflyIII\Export;
 
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Export\Collector\AttachmentCollector;
+use FireflyIII\Export\Collector\UploadCollector;
 use FireflyIII\Export\Entry\Entry;
 use FireflyIII\Models\ExportJob;
 use FireflyIII\Models\TransactionJournal;
@@ -78,7 +80,8 @@ class Processor
      */
     public function collectAttachments(): bool
     {
-        $attachmentCollector = app('FireflyIII\Export\Collector\AttachmentCollector', [$this->job]);
+        /** @var AttachmentCollector $attachmentCollector */
+        $attachmentCollector = app(AttachmentCollector::class, [$this->job]);
         $attachmentCollector->run();
         $this->files = $this->files->merge($attachmentCollector->getFiles());
 
@@ -110,7 +113,8 @@ class Processor
      */
     public function collectOldUploads(): bool
     {
-        $uploadCollector = app('FireflyIII\Export\Collector\UploadCollector', [$this->job]);
+        /** @var UploadCollector $uploadCollector */
+        $uploadCollector = app(UploadCollector::class, [$this->job]);
         $uploadCollector->run();
 
         $this->files = $this->files->merge($uploadCollector->getFiles());
@@ -139,7 +143,7 @@ class Processor
      */
     public function createConfigFile(): bool
     {
-        $this->configurationMaker = app('FireflyIII\Export\ConfigurationFile', [$this->job]);
+        $this->configurationMaker = app(ConfigurationFile::class, [$this->job]);
         $this->files->push($this->configurationMaker->make());
 
         return true;
diff --git a/app/Handlers/Events/AttachUserRole.php b/app/Handlers/Events/AttachUserRole.php
index a063658c22..86a0d5d102 100644
--- a/app/Handlers/Events/AttachUserRole.php
+++ b/app/Handlers/Events/AttachUserRole.php
@@ -40,7 +40,7 @@ class AttachUserRole
     {
         Log::debug('Trigger attachuserrole');
         /** @var UserRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\User\UserRepositoryInterface');
+        $repository = app(UserRepositoryInterface::class);
 
         // first user ever?
         if ($repository->count() == 1) {
diff --git a/app/Helpers/Csv/Converter/AccountId.php b/app/Helpers/Csv/Converter/AccountId.php
index 0ec7072a17..c1ec021dee 100644
--- a/app/Helpers/Csv/Converter/AccountId.php
+++ b/app/Helpers/Csv/Converter/AccountId.php
@@ -19,7 +19,7 @@ class AccountId extends BasicConverter implements ConverterInterface
     public function convert(): Account
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
         $var        = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $account    = $repository->find($var);
 
diff --git a/app/Helpers/Csv/Converter/AssetAccountIban.php b/app/Helpers/Csv/Converter/AssetAccountIban.php
index 83636c4de5..83c5dd2c34 100644
--- a/app/Helpers/Csv/Converter/AssetAccountIban.php
+++ b/app/Helpers/Csv/Converter/AssetAccountIban.php
@@ -22,7 +22,7 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
     public function convert(): Account
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
@@ -44,7 +44,6 @@ class AssetAccountIban extends BasicConverter implements ConverterInterface
 
     /**
      * @param AccountRepositoryInterface $repository
-     * @param                            $value
      *
      * @return Account
      */
diff --git a/app/Helpers/Csv/Converter/AssetAccountName.php b/app/Helpers/Csv/Converter/AssetAccountName.php
index 8bec1cee8a..cfe81f487a 100644
--- a/app/Helpers/Csv/Converter/AssetAccountName.php
+++ b/app/Helpers/Csv/Converter/AssetAccountName.php
@@ -21,7 +21,7 @@ class AssetAccountName extends BasicConverter implements ConverterInterface
     public function convert(): Account
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
         if (isset($this->mapped[$this->index][$this->value])) {
             $account = $repository->find(intval($this->mapped[$this->index][$this->value]));
 
diff --git a/app/Helpers/Csv/Converter/AssetAccountNumber.php b/app/Helpers/Csv/Converter/AssetAccountNumber.php
index ece314361c..646504635f 100644
--- a/app/Helpers/Csv/Converter/AssetAccountNumber.php
+++ b/app/Helpers/Csv/Converter/AssetAccountNumber.php
@@ -30,7 +30,7 @@ class AssetAccountNumber extends BasicConverter implements ConverterInterface
     public function convert(): Account
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
diff --git a/app/Helpers/Csv/Converter/BillId.php b/app/Helpers/Csv/Converter/BillId.php
index 847ead3b90..30573e8c37 100644
--- a/app/Helpers/Csv/Converter/BillId.php
+++ b/app/Helpers/Csv/Converter/BillId.php
@@ -19,7 +19,7 @@ class BillId extends BasicConverter implements ConverterInterface
     public function convert(): Bill
     {
         /** @var BillRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $repository = app(BillRepositoryInterface::class);
         $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $bill       = $repository->find($value);
 
diff --git a/app/Helpers/Csv/Converter/BillName.php b/app/Helpers/Csv/Converter/BillName.php
index 11de5bdbb2..93edca01cd 100644
--- a/app/Helpers/Csv/Converter/BillName.php
+++ b/app/Helpers/Csv/Converter/BillName.php
@@ -19,7 +19,7 @@ class BillName extends BasicConverter implements ConverterInterface
     public function convert(): Bill
     {
         /** @var BillRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Bill\BillRepositoryInterface');
+        $repository = app(BillRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             return $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/BudgetId.php b/app/Helpers/Csv/Converter/BudgetId.php
index 27e759ecbf..d246e7c060 100644
--- a/app/Helpers/Csv/Converter/BudgetId.php
+++ b/app/Helpers/Csv/Converter/BudgetId.php
@@ -19,7 +19,7 @@ class BudgetId extends BasicConverter implements ConverterInterface
     public function convert(): Budget
     {
         /** @var BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $repository = app(BudgetRepositoryInterface::class);
         $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $budget     = $repository->find($value);
 
diff --git a/app/Helpers/Csv/Converter/BudgetName.php b/app/Helpers/Csv/Converter/BudgetName.php
index 1aa5e954eb..00c4e8d3ff 100644
--- a/app/Helpers/Csv/Converter/BudgetName.php
+++ b/app/Helpers/Csv/Converter/BudgetName.php
@@ -20,7 +20,7 @@ class BudgetName extends BasicConverter implements ConverterInterface
     public function convert(): Budget
     {
         /** @var BudgetRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Budget\BudgetRepositoryInterface');
+        $repository = app(BudgetRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
diff --git a/app/Helpers/Csv/Converter/CategoryId.php b/app/Helpers/Csv/Converter/CategoryId.php
index 02ae657a91..b28b62a224 100644
--- a/app/Helpers/Csv/Converter/CategoryId.php
+++ b/app/Helpers/Csv/Converter/CategoryId.php
@@ -19,7 +19,7 @@ class CategoryId extends BasicConverter implements ConverterInterface
     public function convert(): Category
     {
         /** @var SingleCategoryRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
+        $repository = app(SingleCategoryRepositoryInterface::class);
         $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $category   = $repository->find($value);
 
diff --git a/app/Helpers/Csv/Converter/CategoryName.php b/app/Helpers/Csv/Converter/CategoryName.php
index 26df88b8c5..c987bc3192 100644
--- a/app/Helpers/Csv/Converter/CategoryName.php
+++ b/app/Helpers/Csv/Converter/CategoryName.php
@@ -20,7 +20,7 @@ class CategoryName extends BasicConverter implements ConverterInterface
     public function convert(): Category
     {
         /** @var SingleCategoryRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Category\SingleCategoryRepositoryInterface');
+        $repository = app(SingleCategoryRepositoryInterface::class);
 
         // is mapped? Then it's easy!
         if (isset($this->mapped[$this->index][$this->value])) {
diff --git a/app/Helpers/Csv/Converter/CurrencyCode.php b/app/Helpers/Csv/Converter/CurrencyCode.php
index 47a6fe5ee7..f77aadc8cb 100644
--- a/app/Helpers/Csv/Converter/CurrencyCode.php
+++ b/app/Helpers/Csv/Converter/CurrencyCode.php
@@ -19,7 +19,7 @@ class CurrencyCode extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $currency = $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/CurrencyId.php b/app/Helpers/Csv/Converter/CurrencyId.php
index 3ab3f0fd3a..73ea0defba 100644
--- a/app/Helpers/Csv/Converter/CurrencyId.php
+++ b/app/Helpers/Csv/Converter/CurrencyId.php
@@ -19,7 +19,7 @@ class CurrencyId extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
         $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $currency   = $repository->find($value);
 
diff --git a/app/Helpers/Csv/Converter/CurrencyName.php b/app/Helpers/Csv/Converter/CurrencyName.php
index f4a020d430..e517df855b 100644
--- a/app/Helpers/Csv/Converter/CurrencyName.php
+++ b/app/Helpers/Csv/Converter/CurrencyName.php
@@ -19,7 +19,7 @@ class CurrencyName extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $currency = $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/CurrencySymbol.php b/app/Helpers/Csv/Converter/CurrencySymbol.php
index e89a5fbe64..5235fbc889 100644
--- a/app/Helpers/Csv/Converter/CurrencySymbol.php
+++ b/app/Helpers/Csv/Converter/CurrencySymbol.php
@@ -19,7 +19,7 @@ class CurrencySymbol extends BasicConverter implements ConverterInterface
     public function convert(): TransactionCurrency
     {
         /** @var CurrencyRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Currency\CurrencyRepositoryInterface');
+        $repository = app(CurrencyRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $currency = $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/OpposingAccountIban.php b/app/Helpers/Csv/Converter/OpposingAccountIban.php
index e75c3b5abd..902e7df0aa 100644
--- a/app/Helpers/Csv/Converter/OpposingAccountIban.php
+++ b/app/Helpers/Csv/Converter/OpposingAccountIban.php
@@ -21,7 +21,7 @@ class OpposingAccountIban extends BasicConverter implements ConverterInterface
     public function convert()
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $account = $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/OpposingAccountId.php b/app/Helpers/Csv/Converter/OpposingAccountId.php
index 742a4e3263..a28fbe0e2b 100644
--- a/app/Helpers/Csv/Converter/OpposingAccountId.php
+++ b/app/Helpers/Csv/Converter/OpposingAccountId.php
@@ -20,7 +20,7 @@ class OpposingAccountId extends BasicConverter implements ConverterInterface
     public function convert(): Account
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
         $value      = isset($this->mapped[$this->index][$this->value]) ? $this->mapped[$this->index][$this->value] : $this->value;
         $account    = $repository->find($value);
 
diff --git a/app/Helpers/Csv/Converter/OpposingAccountName.php b/app/Helpers/Csv/Converter/OpposingAccountName.php
index 302a224803..bda3aa1938 100644
--- a/app/Helpers/Csv/Converter/OpposingAccountName.php
+++ b/app/Helpers/Csv/Converter/OpposingAccountName.php
@@ -21,7 +21,7 @@ class OpposingAccountName extends BasicConverter implements ConverterInterface
     public function convert()
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
 
         if (isset($this->mapped[$this->index][$this->value])) {
             $account = $repository->find($this->mapped[$this->index][$this->value]);
diff --git a/app/Helpers/Csv/Converter/TagsComma.php b/app/Helpers/Csv/Converter/TagsComma.php
index a38d64cce8..3bd448628e 100644
--- a/app/Helpers/Csv/Converter/TagsComma.php
+++ b/app/Helpers/Csv/Converter/TagsComma.php
@@ -19,7 +19,7 @@ class TagsComma extends BasicConverter implements ConverterInterface
     public function convert(): Collection
     {
         /** @var TagRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
+        $repository = app(TagRepositoryInterface::class);
         $tags       = new Collection;
 
         $strings = explode(',', $this->value);
diff --git a/app/Helpers/Csv/Converter/TagsSpace.php b/app/Helpers/Csv/Converter/TagsSpace.php
index 60eeba8b7d..5b1ee2cab3 100644
--- a/app/Helpers/Csv/Converter/TagsSpace.php
+++ b/app/Helpers/Csv/Converter/TagsSpace.php
@@ -19,7 +19,7 @@ class TagsSpace extends BasicConverter implements ConverterInterface
     public function convert(): Collection
     {
         /** @var TagRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Tag\TagRepositoryInterface');
+        $repository = app(TagRepositoryInterface::class);
 
         $tags = new Collection;
 
diff --git a/app/Helpers/Csv/PostProcessing/AssetAccount.php b/app/Helpers/Csv/PostProcessing/AssetAccount.php
index 542c72e0be..2d3195b7fd 100644
--- a/app/Helpers/Csv/PostProcessing/AssetAccount.php
+++ b/app/Helpers/Csv/PostProcessing/AssetAccount.php
@@ -6,6 +6,7 @@ use Auth;
 use Carbon\Carbon;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use Log;
 use Validator;
 
@@ -244,8 +245,8 @@ class AssetAccount implements PostProcessorInterface
             }
         }
         // create new if not exists and return that one:
-        /** @var \FireflyIII\Repositories\Account\AccountRepositoryInterface $repository */
-        $repository  = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        /** @var AccountRepositoryInterface $repository */
+        $repository  = app(AccountRepositoryInterface::class);
         $accountData = [
             'name'                   => $accountNumber,
             'accountType'            => 'asset',
diff --git a/app/Http/Controllers/Popup/ReportController.php b/app/Http/Controllers/Popup/ReportController.php
index b82e96c7a5..a7a4d75d13 100644
--- a/app/Http/Controllers/Popup/ReportController.php
+++ b/app/Http/Controllers/Popup/ReportController.php
@@ -87,7 +87,7 @@ class ReportController extends Controller
         $budget           = $budgetRepository->find(intval($attributes['budgetId']));
 
         /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $accountRepository = app(AccountRepositoryInterface::class);
         $account           = $accountRepository->find(intval($attributes['accountId']));
 
         switch (true) {
@@ -177,7 +177,7 @@ class ReportController extends Controller
     private function expenseEntry(array $attributes): string
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
         $account    = $repository->find(intval($attributes['accountId']));
         $journals   = $repository->getExpensesByDestination($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
         $view       = view('popup.report.expense-entry', compact('journals', 'account'))->render();
@@ -196,7 +196,7 @@ class ReportController extends Controller
     private function incomeEntry(array $attributes): string
     {
         /** @var AccountRepositoryInterface $repository */
-        $repository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repository = app(AccountRepositoryInterface::class);
         $account    = $repository->find(intval($attributes['accountId']));
         $journals   = $repository->getIncomeByDestination($account, $attributes['accounts'], $attributes['startDate'], $attributes['endDate']);
         $view       = view('popup.report.income-entry', compact('journals', 'account'))->render();
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 4354a815af..2bd4837ff7 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -147,7 +147,7 @@ class ReportController extends Controller
     private function auditReport(Carbon $start, Carbon $end, Collection $accounts)
     {
         /** @var ARI $repos */
-        $repos     = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $repos     = app(ARI::class);
         $auditData = [];
         $dayBefore = clone $start;
         $dayBefore->subDay();
diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php
index 2883837f27..7e6040fc2b 100644
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -289,7 +289,7 @@ class TransactionController extends Controller
     {
         $subTitle = trans('firefly.mass_edit_journals');
         /** @var ARI $accountRepository */
-        $accountRepository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $accountRepository = app(ARI::class);
         $accountList       = ExpandedForm::makeSelectList($accountRepository->getAccounts(['Default account', 'Asset account']));
 
         // put previous url in session
diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php
index fbae113952..bf02a92306 100644
--- a/app/Repositories/Bill/BillRepository.php
+++ b/app/Repositories/Bill/BillRepository.php
@@ -263,7 +263,7 @@ class BillRepository implements BillRepositoryInterface
     {
 
         /** @var AccountRepositoryInterface $accountRepository */
-        $accountRepository = app('FireflyIII\Repositories\Account\AccountRepositoryInterface');
+        $accountRepository = app(AccountRepositoryInterface::class);
         $amount            = '0';
         $creditCards       = $accountRepository->getCreditCards($end); // Find credit card accounts and possibly unpaid credit card bills.
         /** @var Account $creditCard */