diff --git a/appinfo/info.xml b/appinfo/info.xml
index 515e703..af8666f 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -23,15 +23,15 @@
         <command>OCA\OrganizationFolders\Command\OrganizationFolder\ListOrganizationFolders</command>
         <command>OCA\OrganizationFolders\Command\OrganizationFolder\CreateOrganizationFolder</command>
         <command>OCA\OrganizationFolders\Command\OrganizationFolder\UpdateOrganizationFolder</command>
-        <command>OCA\OrganizationFolders\Command\OrganizationFolder\RemoveOrganizationFolder</command>
+        <command>OCA\OrganizationFolders\Command\OrganizationFolder\DeleteOrganizationFolder</command>
         <command>OCA\OrganizationFolders\Command\OrganizationFolder\FixACLsOfOrganizationFolder</command>
         <command>OCA\OrganizationFolders\Command\Resource\CreateResource</command>
         <command>OCA\OrganizationFolders\Command\Resource\ListResources</command>
         <command>OCA\OrganizationFolders\Command\Resource\UpdateResource</command>
-        <command>OCA\OrganizationFolders\Command\Resource\RemoveResource</command>
+        <command>OCA\OrganizationFolders\Command\Resource\DeleteResource</command>
         <command>OCA\OrganizationFolders\Command\ResourceMember\CreateResourceMember</command>
         <command>OCA\OrganizationFolders\Command\ResourceMember\ListResourceMembers</command>
-        <command>OCA\OrganizationFolders\Command\ResourceMember\RemoveResourceMember</command>
+        <command>OCA\OrganizationFolders\Command\ResourceMember\DeleteResourceMember</command>
         <command>OCA\OrganizationFolders\Command\OrganizationProvider\ListOrganizationProviders</command>
         <command>OCA\OrganizationFolders\Command\OrganizationProvider\ListOrganizations</command>
         <command>OCA\OrganizationFolders\Command\OrganizationProvider\ListOrganizationRoles</command>
diff --git a/lib/Command/OrganizationFolder/RemoveOrganizationFolder.php b/lib/Command/OrganizationFolder/DeleteOrganizationFolder.php
similarity index 84%
rename from lib/Command/OrganizationFolder/RemoveOrganizationFolder.php
rename to lib/Command/OrganizationFolder/DeleteOrganizationFolder.php
index 1778c24..1caec90 100644
--- a/lib/Command/OrganizationFolder/RemoveOrganizationFolder.php
+++ b/lib/Command/OrganizationFolder/DeleteOrganizationFolder.php
@@ -9,11 +9,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use OCA\OrganizationFolders\Command\BaseCommand;
 
-class RemoveOrganizationFolder extends BaseCommand {
+class DeleteOrganizationFolder extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:remove')
-			->setDescription('Remove a new organization folder')
+			->setName('organization-folders:delete')
+			->setDescription('Delete an organization folder')
 			->addArgument('id', InputArgument::REQUIRED, 'Id of the organization folder to remove');
 	}
 
diff --git a/lib/Command/OrganizationFolder/UpdateOrganizationFolder.php b/lib/Command/OrganizationFolder/UpdateOrganizationFolder.php
index 826d458..71bb7bb 100644
--- a/lib/Command/OrganizationFolder/UpdateOrganizationFolder.php
+++ b/lib/Command/OrganizationFolder/UpdateOrganizationFolder.php
@@ -14,7 +14,7 @@ class UpdateOrganizationFolder extends BaseCommand {
 	protected function configure(): void {
 		$this
 			->setName('organization-folders:update')
-			->setDescription('Update a organization folder')
+			->setDescription('Update an organization folder')
             ->addArgument('id', InputArgument::REQUIRED, 'Id of the organization folder to update')
 			->addOption('name', null, InputOption::VALUE_OPTIONAL, 'New name of the organization folder')
 			->addOption('quota', null, InputOption::VALUE_OPTIONAL, 'New storage quota of the organization folder')
diff --git a/lib/Command/OrganizationProvider/GetOrganizationRole.php b/lib/Command/OrganizationProvider/GetOrganizationRole.php
index fed3c65..15cfe98 100644
--- a/lib/Command/OrganizationProvider/GetOrganizationRole.php
+++ b/lib/Command/OrganizationProvider/GetOrganizationRole.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class GetOrganizationRole extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:get-organization-role')
+			->setName('organization-folders:organization-roles:get')
 			->setDescription('Get a specific organization role by id')
             ->addArgument('provider-id', InputArgument::REQUIRED, 'provider to query')
             ->addArgument('role-id', InputArgument::REQUIRED, '');
diff --git a/lib/Command/OrganizationProvider/ListOrganizationProviders.php b/lib/Command/OrganizationProvider/ListOrganizationProviders.php
index b10c05c..15d3b5b 100644
--- a/lib/Command/OrganizationProvider/ListOrganizationProviders.php
+++ b/lib/Command/OrganizationProvider/ListOrganizationProviders.php
@@ -11,7 +11,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class ListOrganizationProviders extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:list-organization-providers')
+			->setName('organization-folders:organization-providers:list')
 			->setDescription('List all registered organization providers');
 		parent::configure();
 	}
diff --git a/lib/Command/OrganizationProvider/ListOrganizationRoles.php b/lib/Command/OrganizationProvider/ListOrganizationRoles.php
index e9098a3..e127115 100644
--- a/lib/Command/OrganizationProvider/ListOrganizationRoles.php
+++ b/lib/Command/OrganizationProvider/ListOrganizationRoles.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class ListOrganizationRoles extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:list-organization-roles')
+			->setName('organization-folders:organization-roles:list')
 			->setDescription('List all roles in a specific organization')
             ->addArgument('provider-id', InputArgument::REQUIRED, 'provider to query')
             ->addArgument('organization-id', InputArgument::REQUIRED, 'organization id to query roles of');
diff --git a/lib/Command/OrganizationProvider/ListOrganizations.php b/lib/Command/OrganizationProvider/ListOrganizations.php
index 701f6cc..a7c8007 100644
--- a/lib/Command/OrganizationProvider/ListOrganizations.php
+++ b/lib/Command/OrganizationProvider/ListOrganizations.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class ListOrganizations extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:list-organizations')
+			->setName('organization-folders:organizations:list')
 			->setDescription('List all organizations provided by a specific organization provider')
             ->addArgument('provider-id', InputArgument::REQUIRED, 'provider to query')
             ->addArgument('parent-organization-id', InputArgument::OPTIONAL, 'parent organization to fetch child organizations of. Using top-level if omitted');
diff --git a/lib/Command/Resource/CreateResource.php b/lib/Command/Resource/CreateResource.php
index 9ca230d..2f32a42 100644
--- a/lib/Command/Resource/CreateResource.php
+++ b/lib/Command/Resource/CreateResource.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class CreateResource extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:create-resource')
+			->setName('organization-folders:resources:create')
 			->setDescription('Create a new resource in organization folder')
 			->addOption('organization-folder', null, InputOption::VALUE_REQUIRED, 'Id of organization folder to create resource in')
 			->addOption('type', null, InputOption::VALUE_REQUIRED, 'Type of resource (valid values: folder)')
diff --git a/lib/Command/Resource/RemoveResource.php b/lib/Command/Resource/DeleteResource.php
similarity index 85%
rename from lib/Command/Resource/RemoveResource.php
rename to lib/Command/Resource/DeleteResource.php
index 0d36598..970a403 100644
--- a/lib/Command/Resource/RemoveResource.php
+++ b/lib/Command/Resource/DeleteResource.php
@@ -9,11 +9,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use OCA\OrganizationFolders\Command\BaseCommand;
 
-class RemoveResource extends BaseCommand {
+class DeleteResource extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:remove-resource')
-			->setDescription('Remove a resource')
+			->setName('organization-folders:resources:delete')
+			->setDescription('Delete a resource')
 			->addArgument('id', InputArgument::REQUIRED, 'Id of the resource');
 	}
 
diff --git a/lib/Command/Resource/ListResources.php b/lib/Command/Resource/ListResources.php
index 4a0fe01..a43b462 100644
--- a/lib/Command/Resource/ListResources.php
+++ b/lib/Command/Resource/ListResources.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class ListResources extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:list-resources')
+			->setName('organization-folders:resources:list')
             ->addArgument('organization-folder-id', InputArgument::REQUIRED, 'Id of Organization Folder')
             ->addArgument('parent-resource-id', InputArgument::OPTIONAL, 'Id of Organization Folder')
 			->setDescription('List all resource in organization folder. Only shows one layer of tree at once, provide resource parent id to reveal child resources.');
diff --git a/lib/Command/Resource/UpdateResource.php b/lib/Command/Resource/UpdateResource.php
index 21efa0e..dd09829 100644
--- a/lib/Command/Resource/UpdateResource.php
+++ b/lib/Command/Resource/UpdateResource.php
@@ -13,7 +13,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class UpdateResource extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:update-resource')
+			->setName('organization-folders:resources:update')
 			->setDescription('Update a resource')
             ->addArgument('id', InputArgument::REQUIRED, 'Id of the resource to update')
 			->addOption('name', null, InputOption::VALUE_OPTIONAL, 'New name of resource');
diff --git a/lib/Command/ResourceMember/CreateResourceMember.php b/lib/Command/ResourceMember/CreateResourceMember.php
index 1a99853..433683c 100644
--- a/lib/Command/ResourceMember/CreateResourceMember.php
+++ b/lib/Command/ResourceMember/CreateResourceMember.php
@@ -14,7 +14,7 @@ use OCA\OrganizationFolders\Enum\MemberPermissionLevel;
 class CreateResourceMember extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:create-resource-member')
+			->setName('organization-folders:resource-members:create')
 			->setDescription('Create a new member of resource')
 			->addOption('resource-id', null, InputOption::VALUE_REQUIRED, 'Id of resource to create member of')
 			->addOption('permission-level', null, InputOption::VALUE_REQUIRED, 'Permissions level of member (valid values: MEMBER, MANAGER)')
diff --git a/lib/Command/ResourceMember/RemoveResourceMember.php b/lib/Command/ResourceMember/DeleteResourceMember.php
similarity index 83%
rename from lib/Command/ResourceMember/RemoveResourceMember.php
rename to lib/Command/ResourceMember/DeleteResourceMember.php
index d6b625b..f58e74b 100644
--- a/lib/Command/ResourceMember/RemoveResourceMember.php
+++ b/lib/Command/ResourceMember/DeleteResourceMember.php
@@ -9,11 +9,11 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use OCA\OrganizationFolders\Command\BaseCommand;
 
-class RemoveResourceMember extends BaseCommand {
+class DeleteResourceMember extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:remove-resource-member')
-			->setDescription('Remove a member of a resource')
+			->setName('organization-folders:resource-members:delete')
+			->setDescription('Delete a member of a resource')
 			->addArgument('id', InputArgument::REQUIRED, 'Id of the resource member');
 	}
 
diff --git a/lib/Command/ResourceMember/ListResourceMembers.php b/lib/Command/ResourceMember/ListResourceMembers.php
index 0a81c5b..780d687 100644
--- a/lib/Command/ResourceMember/ListResourceMembers.php
+++ b/lib/Command/ResourceMember/ListResourceMembers.php
@@ -12,7 +12,7 @@ use OCA\OrganizationFolders\Command\BaseCommand;
 class ListResourceMembers extends BaseCommand {
 	protected function configure(): void {
 		$this
-			->setName('organization-folders:list-resource-members')
+			->setName('organization-folders:resource-members:list')
             ->addArgument('resource-id', InputArgument::REQUIRED, 'Id of Resource')
 			->setDescription('List all members of resource.');