From 2d693fd10c38ce5b9c4939ce689279bbba1feef7 Mon Sep 17 00:00:00 2001
From: Rohit <rothakur1210@gmail.com>
Date: Wed, 1 Apr 2026 19:56:31 +0530
Subject: [PATCH] change module names to plural

Signed-off-by: Rohit <rothakur1210@gmail.com>
---
 README.md                                     | 213 +++++++++++++-----
 docs/01-overview.md                           |   2 +-
 docs/02-resource-module-pattern.md            |  26 +--
 docs/04-data-model-transformation.md          |   2 +-
 docs/07-adding-resources.md                   |  10 +-
 docs/08-testing-strategy.md                   |  14 +-
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check/prepare.yml                         |   6 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted/prepare.yml                       |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../gathered/prepare.yml                      |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../overridden}/cleanup.yml                   |   4 +-
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced/prepare.yml                      |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../authenticator/replaced/cleanup.yml        |  19 --
 .../authenticator_map/replaced/cleanup.yml    |  30 ---
 .../check/cleanup.yml                         |   6 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check}/prepare.yml                        |   8 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   4 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted}/prepare.yml                      |   8 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered/cleanup.yml                      |   6 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../gathered}/prepare.yml                     |   8 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged/cleanup.yml                        |   6 +-
 .../merged/converge.yml                       |   6 +-
 .../merged}/molecule.yml                      |   0
 .../merged/prepare.yml                        |   4 +-
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../authenticator_maps/overridden/cleanup.yml |  30 +++
 .../overridden/converge.yml                   |   6 +-
 .../overridden}/molecule.yml                  |   0
 .../overridden/prepare.yml                    |   6 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   6 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced}/molecule.yml                    |   0
 .../replaced}/prepare.yml                     |   8 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check/prepare.yml                         |   6 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted}/molecule.yml                     |   0
 .../deleted/prepare.yml                       |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered}/molecule.yml                    |   0
 .../gathered/prepare.yml                      |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../authenticators/overridden/cleanup.yml     |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced/prepare.yml                      |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../ca_certificate/replaced/cleanup.yml       |  19 --
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check/prepare.yml                         |   6 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted/prepare.yml                       |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../gathered/prepare.yml                      |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../ca_certificates/overridden/cleanup.yml    |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../ca_certificates/overridden/prepare.yml    |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced/prepare.yml                      |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../molecule/http_port/replaced/cleanup.yml   |  19 --
 .../molecule/http_port/replaced/prepare.yml   |  18 --
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../molecule/http_ports/check/prepare.yml     |  18 ++
 .../{http_port => http_ports}/check/vars.yml  |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted}/prepare.yml                      |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered/cleanup.yml                      |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../check => http_ports/gathered}/prepare.yml |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../{http_port => http_ports}/inventory.yml   |   0
 .../merged/cleanup.yml                        |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../{http_port => http_ports}/merged/vars.yml |   0
 .../merged/verify.yml                         |   6 +-
 .../http_ports/overridden/cleanup.yml         |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced}/prepare.yml                     |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../organization/replaced/cleanup.yml         |  19 --
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check/prepare.yml                         |   6 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted/prepare.yml                       |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../gathered/prepare.yml                      |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../organizations/overridden/cleanup.yml      |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced/prepare.yml                      |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../role_definition/overridden/prepare.yml    |  17 --
 .../role_definition/replaced/cleanup.yml      |  19 --
 .../check/cleanup.yml                         |   4 +-
 .../role_definitions/check/converge.yml       |  36 +++
 .../check/molecule.yml                        |   0
 .../role_definitions/check/prepare.yml        |  18 ++
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../role_definitions/deleted/converge.yml     |  19 ++
 .../deleted/molecule.yml                      |   0
 .../deleted}/prepare.yml                      |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../role_definitions/gathered/converge.yml    |  19 ++
 .../gathered/molecule.yml                     |   0
 .../role_definitions/gathered/prepare.yml     |  18 ++
 .../gathered/vars.yml                         |   0
 .../role_definitions/gathered/verify.yml      |  26 +++
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../role_definitions/merged/converge.yml      |  19 ++
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../role_definitions/merged/verify.yml        |  26 +++
 .../role_definitions/overridden/cleanup.yml   |  19 ++
 .../role_definitions/overridden/converge.yml  |  19 ++
 .../overridden/molecule.yml                   |   0
 .../role_definitions/overridden/prepare.yml   |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../role_definitions/replaced/converge.yml    |  19 ++
 .../replaced/molecule.yml                     |   0
 .../role_definitions/replaced/prepare.yml     |  18 ++
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../molecule/route/replaced/cleanup.yml       |  19 --
 .../merged => routes/check}/cleanup.yml       |   4 +-
 .../{user => routes}/check/converge.yml       |   6 +-
 .../{route => routes}/check/molecule.yml      |   0
 extensions/molecule/routes/check/prepare.yml  |  18 ++
 .../molecule/{route => routes}/check/vars.yml |   0
 .../{route => routes}/check/verify.yml        |   6 +-
 .../{route => routes}/deleted/cleanup.yml     |   2 +-
 .../{user => routes}/deleted/converge.yml     |   6 +-
 .../{route => routes}/deleted/molecule.yml    |   0
 .../gathered => routes/deleted}/prepare.yml   |   6 +-
 .../{route => routes}/deleted/vars.yml        |   0
 .../{route => routes}/deleted/verify.yml      |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../{user => routes}/gathered/converge.yml    |   6 +-
 .../{route => routes}/gathered/molecule.yml   |   0
 .../molecule/routes/gathered/prepare.yml      |  18 ++
 .../{route => routes}/gathered/vars.yml       |   0
 .../{route => routes}/gathered/verify.yml     |   6 +-
 .../molecule/{route => routes}/inventory.yml  |   0
 .../gathered => routes/merged}/cleanup.yml    |   4 +-
 .../{team => routes}/merged/converge.yml      |   6 +-
 .../{route => routes}/merged/molecule.yml     |   0
 .../{route => routes}/merged/vars.yml         |   0
 .../{team => routes}/merged/verify.yml        |   6 +-
 .../molecule/routes/overridden/cleanup.yml    |  19 ++
 .../{team => routes}/overridden/converge.yml  |   6 +-
 .../{route => routes}/overridden/molecule.yml |   0
 .../{user => routes}/overridden/prepare.yml   |   4 +-
 .../{route => routes}/overridden/vars.yml     |   0
 .../{route => routes}/overridden/verify.yml   |   6 +-
 .../check => routes/replaced}/cleanup.yml     |   4 +-
 .../{user => routes}/replaced/converge.yml    |   6 +-
 .../{route => routes}/replaced/molecule.yml   |   0
 .../molecule/routes/replaced/prepare.yml      |  18 ++
 .../{route => routes}/replaced/vars.yml       |   0
 .../{route => routes}/replaced/verify.yml     |   6 +-
 extensions/molecule/service/check/prepare.yml |  18 --
 .../molecule/service/deleted/prepare.yml      |  18 --
 .../molecule/service/gathered/prepare.yml     |  18 --
 .../molecule/service/replaced/cleanup.yml     |  19 --
 .../molecule/service/replaced/prepare.yml     |  18 --
 .../service_cluster/check/converge.yml        |  36 ---
 .../service_cluster/check/prepare.yml         |  18 --
 .../service_cluster/deleted/converge.yml      |  19 --
 .../service_cluster/deleted/prepare.yml       |  18 --
 .../service_cluster/gathered/converge.yml     |  19 --
 .../service_cluster/gathered/prepare.yml      |  18 --
 .../service_cluster/gathered/verify.yml       |  26 ---
 .../service_cluster/merged/converge.yml       |  19 --
 .../service_cluster/merged/verify.yml         |  26 ---
 .../service_cluster/overridden/converge.yml   |  19 --
 .../service_cluster/overridden/prepare.yml    |  17 --
 .../service_cluster/replaced/cleanup.yml      |  19 --
 .../service_cluster/replaced/converge.yml     |  19 --
 .../service_cluster/replaced/prepare.yml      |  18 --
 .../check/cleanup.yml                         |   4 +-
 .../service_clusters/check/converge.yml       |  36 +++
 .../check/molecule.yml                        |   0
 .../service_clusters/check/prepare.yml        |  18 ++
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../service_clusters/deleted/converge.yml     |  19 ++
 .../deleted/molecule.yml                      |   0
 .../service_clusters/deleted/prepare.yml      |  18 ++
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../service_clusters/gathered/converge.yml    |  19 ++
 .../gathered/molecule.yml                     |   0
 .../service_clusters/gathered/prepare.yml     |  18 ++
 .../gathered/vars.yml                         |   0
 .../service_clusters/gathered/verify.yml      |  26 +++
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../service_clusters/merged/converge.yml      |  19 ++
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../service_clusters/merged/verify.yml        |  26 +++
 .../service_clusters/overridden/cleanup.yml   |  19 ++
 .../service_clusters/overridden/converge.yml  |  19 ++
 .../overridden/molecule.yml                   |   0
 .../service_clusters/overridden/prepare.yml   |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../service_clusters/replaced/converge.yml    |  19 ++
 .../replaced/molecule.yml                     |   0
 .../service_clusters/replaced/prepare.yml     |  18 ++
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../molecule/service_key/check/converge.yml   |  36 ---
 .../molecule/service_key/check/prepare.yml    |  18 --
 .../molecule/service_key/deleted/converge.yml |  19 --
 .../molecule/service_key/deleted/prepare.yml  |  18 --
 .../service_key/gathered/converge.yml         |  19 --
 .../molecule/service_key/gathered/prepare.yml |  18 --
 .../molecule/service_key/gathered/verify.yml  |  26 ---
 .../molecule/service_key/merged/converge.yml  |  19 --
 .../molecule/service_key/merged/verify.yml    |  26 ---
 .../service_key/overridden/converge.yml       |  19 --
 .../service_key/overridden/prepare.yml        |  17 --
 .../molecule/service_key/replaced/cleanup.yml |  19 --
 .../service_key/replaced/converge.yml         |  19 --
 .../molecule/service_key/replaced/prepare.yml |  18 --
 .../check/cleanup.yml                         |   4 +-
 .../check/converge.yml                        |   6 +-
 .../check/molecule.yml                        |   0
 .../check/prepare.yml                         |   6 +-
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted/prepare.yml                       |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../gathered/prepare.yml                      |   6 +-
 .../gathered/vars.yml                         |   0
 .../gathered/verify.yml                       |   6 +-
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../merged/converge.yml                       |   6 +-
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../merged/verify.yml                         |   6 +-
 .../service_keys/overridden/cleanup.yml       |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../replaced/prepare.yml                      |   6 +-
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../molecule/service_node/check/converge.yml  |  36 ---
 .../molecule/service_node/gathered/verify.yml |  26 ---
 .../molecule/service_node/merged/converge.yml |  19 --
 .../molecule/service_node/merged/verify.yml   |  26 ---
 .../service_node/overridden/prepare.yml       |  17 --
 .../service_node/replaced/cleanup.yml         |  19 --
 .../check/cleanup.yml                         |   4 +-
 .../molecule/service_nodes/check/converge.yml |  36 +++
 .../check/molecule.yml                        |   0
 .../molecule/service_nodes/check/prepare.yml  |  18 ++
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted}/prepare.yml                      |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../service_nodes/gathered/prepare.yml        |  18 ++
 .../gathered/vars.yml                         |   0
 .../service_nodes/gathered/verify.yml         |  26 +++
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../service_nodes/merged/converge.yml         |  19 ++
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../molecule/service_nodes/merged/verify.yml  |  26 +++
 .../service_nodes/overridden/cleanup.yml      |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../service_nodes/overridden/prepare.yml      |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../service_nodes/replaced/prepare.yml        |  18 ++
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../molecule/service_type/check/converge.yml  |  36 ---
 .../molecule/service_type/check/prepare.yml   |  18 --
 .../molecule/service_type/deleted/prepare.yml |  18 --
 .../service_type/gathered/converge.yml        |  19 --
 .../service_type/gathered/prepare.yml         |  18 --
 .../molecule/service_type/gathered/verify.yml |  26 ---
 .../molecule/service_type/merged/converge.yml |  19 --
 .../molecule/service_type/merged/verify.yml   |  26 ---
 .../service_type/overridden/prepare.yml       |  17 --
 .../service_type/replaced/cleanup.yml         |  19 --
 .../service_type/replaced/converge.yml        |  19 --
 .../service_type/replaced/prepare.yml         |  18 --
 .../check/cleanup.yml                         |   4 +-
 .../molecule/service_types/check/converge.yml |  36 +++
 .../check/molecule.yml                        |   0
 .../molecule/service_types/check/prepare.yml  |  18 ++
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../deleted}/prepare.yml                      |   6 +-
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../service_types/gathered/converge.yml       |  19 ++
 .../gathered/molecule.yml                     |   0
 .../service_types/gathered/prepare.yml        |  18 ++
 .../gathered/vars.yml                         |   0
 .../service_types/gathered/verify.yml         |  26 +++
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../service_types/merged/converge.yml         |  19 ++
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../molecule/service_types/merged/verify.yml  |  26 +++
 .../service_types/overridden/cleanup.yml      |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../service_types/overridden/prepare.yml      |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../service_types/replaced/converge.yml       |  19 ++
 .../replaced/molecule.yml                     |   0
 .../service_types/replaced/prepare.yml        |  18 ++
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 .../{service => services}/check/cleanup.yml   |   4 +-
 .../{service => services}/check/converge.yml  |   6 +-
 .../check/molecule.yml                        |   0
 .../molecule/services/check/prepare.yml       |  18 ++
 .../{service => services}/check/vars.yml      |   0
 .../{service => services}/check/verify.yml    |   6 +-
 .../{service => services}/deleted/cleanup.yml |   2 +-
 .../deleted/converge.yml                      |   6 +-
 .../deleted/molecule.yml                      |   0
 .../molecule/services/deleted/prepare.yml     |  18 ++
 .../{service => services}/deleted/vars.yml    |   0
 .../{service => services}/deleted/verify.yml  |   6 +-
 .../merged => services/gathered}/cleanup.yml  |   4 +-
 .../gathered/converge.yml                     |   6 +-
 .../gathered/molecule.yml                     |   0
 .../deleted => services/gathered}/prepare.yml |   6 +-
 .../{service => services}/gathered/vars.yml   |   0
 .../{service => services}/gathered/verify.yml |   6 +-
 .../{service_type => services}/inventory.yml  |   0
 .../gathered => services/merged}/cleanup.yml  |   4 +-
 .../{service => services}/merged/converge.yml |   6 +-
 .../merged/molecule.yml                       |   0
 .../{service => services}/merged/vars.yml     |   0
 .../{service => services}/merged/verify.yml   |   6 +-
 .../molecule/services/overridden/cleanup.yml  |  19 ++
 .../overridden/converge.yml                   |   6 +-
 .../overridden/molecule.yml                   |   0
 .../overridden/prepare.yml                    |   4 +-
 .../{service => services}/overridden/vars.yml |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../replaced/converge.yml                     |   6 +-
 .../replaced/molecule.yml                     |   0
 .../molecule/services/replaced/prepare.yml    |  18 ++
 .../{service => services}/replaced/vars.yml   |   0
 .../{service => services}/replaced/verify.yml |   6 +-
 extensions/molecule/team/check/prepare.yml    |  18 --
 extensions/molecule/team/replaced/cleanup.yml |  19 --
 .../{team/merged => teams/check}/cleanup.yml  |   4 +-
 .../{route => teams}/check/converge.yml       |   6 +-
 .../{team => teams}/check/molecule.yml        |   0
 .../{token => teams}/check/prepare.yml        |   6 +-
 .../molecule/{team => teams}/check/vars.yml   |   0
 .../molecule/{team => teams}/check/verify.yml |   6 +-
 .../{team => teams}/deleted/cleanup.yml       |   2 +-
 .../{route => teams}/deleted/converge.yml     |   6 +-
 .../{team => teams}/deleted/molecule.yml      |   0
 .../{team => teams}/deleted/prepare.yml       |   6 +-
 .../molecule/{team => teams}/deleted/vars.yml |   0
 .../{team => teams}/deleted/verify.yml        |   6 +-
 .../{team => teams}/gathered/cleanup.yml      |   4 +-
 .../{team => teams}/gathered/converge.yml     |   6 +-
 .../{team => teams}/gathered/molecule.yml     |   0
 .../replaced => teams/gathered}/prepare.yml   |   6 +-
 .../{team => teams}/gathered/vars.yml         |   0
 .../{team => teams}/gathered/verify.yml       |   6 +-
 .../molecule/{team => teams}/inventory.yml    |   0
 .../{team/check => teams/merged}/cleanup.yml  |   4 +-
 .../{route => teams}/merged/converge.yml      |   6 +-
 .../{team => teams}/merged/molecule.yml       |   0
 .../molecule/{team => teams}/merged/vars.yml  |   0
 .../{route => teams}/merged/verify.yml        |   6 +-
 .../molecule/teams/overridden/cleanup.yml     |  19 ++
 .../{route => teams}/overridden/converge.yml  |   6 +-
 .../{team => teams}/overridden/molecule.yml   |   0
 .../{team => teams}/overridden/prepare.yml    |   4 +-
 .../{team => teams}/overridden/vars.yml       |   0
 .../{team => teams}/overridden/verify.yml     |   6 +-
 .../overridden => teams/replaced}/cleanup.yml |   4 +-
 .../{route => teams}/replaced/converge.yml    |   6 +-
 .../{team => teams}/replaced/molecule.yml     |   0
 .../gathered => teams/replaced}/prepare.yml   |   6 +-
 .../{team => teams}/replaced/vars.yml         |   0
 .../{team => teams}/replaced/verify.yml       |   6 +-
 extensions/molecule/token/deleted/prepare.yml |  18 --
 .../molecule/token/overridden/.verify.yml.swp | Bin 12288 -> 0 bytes
 .../molecule/token/replaced/cleanup.yml       |  19 --
 .../{token => tokens}/check/cleanup.yml       |   4 +-
 .../{token => tokens}/check/converge.yml      |   6 +-
 .../{token => tokens}/check/molecule.yml      |   0
 extensions/molecule/tokens/check/prepare.yml  |  18 ++
 .../molecule/{token => tokens}/check/vars.yml |   0
 .../{token => tokens}/check/verify.yml        |   6 +-
 .../{token => tokens}/deleted/cleanup.yml     |   2 +-
 .../{token => tokens}/deleted/converge.yml    |   6 +-
 .../{token => tokens}/deleted/molecule.yml    |   0
 .../replaced => tokens/deleted}/prepare.yml   |   6 +-
 .../{token => tokens}/deleted/vars.yml        |   0
 .../{token => tokens}/deleted/verify.yml      |   6 +-
 .../merged => tokens/gathered}/cleanup.yml    |   4 +-
 .../{route => tokens}/gathered/converge.yml   |   6 +-
 .../{token => tokens}/gathered/molecule.yml   |   0
 .../molecule/tokens/gathered/prepare.yml      |  18 ++
 .../{token => tokens}/gathered/vars.yml       |   0
 .../{token => tokens}/gathered/verify.yml     |   6 +-
 .../molecule/{token => tokens}/inventory.yml  |   0
 .../gathered => tokens/merged}/cleanup.yml    |   4 +-
 .../{token => tokens}/merged/converge.yml     |   6 +-
 .../{token => tokens}/merged/molecule.yml     |   0
 .../{token => tokens}/merged/vars.yml         |   0
 .../{token => tokens}/merged/verify.yml       |   6 +-
 .../molecule/tokens/overridden/cleanup.yml    |  19 ++
 .../{token => tokens}/overridden/converge.yml |   6 +-
 .../{token => tokens}/overridden/molecule.yml |   0
 .../{token => tokens}/overridden/prepare.yml  |   4 +-
 .../{token => tokens}/overridden/vars.yml     |   0
 .../{token => tokens}/overridden/verify.yml   |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../{team => tokens}/replaced/converge.yml    |   6 +-
 .../{token => tokens}/replaced/molecule.yml   |   0
 .../molecule/tokens/replaced/prepare.yml      |  18 ++
 .../{token => tokens}/replaced/vars.yml       |   0
 .../{token => tokens}/replaced/verify.yml     |   6 +-
 .../ui_plugin_route/check/converge.yml        |  36 ---
 .../ui_plugin_route/check/prepare.yml         |  18 --
 .../ui_plugin_route/deleted/converge.yml      |  19 --
 .../ui_plugin_route/deleted/prepare.yml       |  18 --
 .../ui_plugin_route/gathered/converge.yml     |  19 --
 .../ui_plugin_route/gathered/prepare.yml      |  18 --
 .../ui_plugin_route/gathered/verify.yml       |  26 ---
 .../ui_plugin_route/merged/converge.yml       |  19 --
 .../ui_plugin_route/merged/verify.yml         |  26 ---
 .../ui_plugin_route/overridden/converge.yml   |  19 --
 .../ui_plugin_route/overridden/prepare.yml    |  17 --
 .../ui_plugin_route/replaced/cleanup.yml      |  19 --
 .../ui_plugin_route/replaced/converge.yml     |  19 --
 .../ui_plugin_route/replaced/prepare.yml      |  18 --
 .../check/cleanup.yml                         |   4 +-
 .../ui_plugin_routes/check/converge.yml       |  36 +++
 .../check/molecule.yml                        |   0
 .../ui_plugin_routes/check/prepare.yml        |  18 ++
 .../check/vars.yml                            |   0
 .../check/verify.yml                          |   6 +-
 .../deleted/cleanup.yml                       |   2 +-
 .../ui_plugin_routes/deleted/converge.yml     |  19 ++
 .../deleted/molecule.yml                      |   0
 .../ui_plugin_routes/deleted/prepare.yml      |  18 ++
 .../deleted/vars.yml                          |   0
 .../deleted/verify.yml                        |   6 +-
 .../gathered}/cleanup.yml                     |   4 +-
 .../ui_plugin_routes/gathered/converge.yml    |  19 ++
 .../gathered/molecule.yml                     |   0
 .../ui_plugin_routes/gathered/prepare.yml     |  18 ++
 .../gathered/vars.yml                         |   0
 .../ui_plugin_routes/gathered/verify.yml      |  26 +++
 .../inventory.yml                             |   0
 .../merged}/cleanup.yml                       |   4 +-
 .../ui_plugin_routes/merged/converge.yml      |  19 ++
 .../merged/molecule.yml                       |   0
 .../merged/vars.yml                           |   0
 .../ui_plugin_routes/merged/verify.yml        |  26 +++
 .../ui_plugin_routes/overridden/cleanup.yml   |  19 ++
 .../ui_plugin_routes/overridden/converge.yml  |  19 ++
 .../overridden/molecule.yml                   |   0
 .../ui_plugin_routes/overridden/prepare.yml   |  17 ++
 .../overridden/vars.yml                       |   0
 .../overridden/verify.yml                     |   6 +-
 .../replaced}/cleanup.yml                     |   4 +-
 .../ui_plugin_routes/replaced/converge.yml    |  19 ++
 .../replaced/molecule.yml                     |   0
 .../ui_plugin_routes/replaced/prepare.yml     |  18 ++
 .../replaced/vars.yml                         |   0
 .../replaced/verify.yml                       |   6 +-
 extensions/molecule/user/check/prepare.yml    |  18 --
 extensions/molecule/user/deleted/prepare.yml  |  18 --
 extensions/molecule/user/gathered/prepare.yml |  18 --
 extensions/molecule/user/replaced/cleanup.yml |  19 --
 extensions/molecule/user/replaced/prepare.yml |  18 --
 .../{user => users}/check/cleanup.yml         |   4 +-
 .../{team => users}/check/converge.yml        |   6 +-
 .../{user => users}/check/molecule.yml        |   0
 .../{route => users}/check/prepare.yml        |   6 +-
 .../molecule/{user => users}/check/vars.yml   |   0
 .../molecule/{user => users}/check/verify.yml |   6 +-
 .../{user => users}/deleted/cleanup.yml       |   2 +-
 .../{team => users}/deleted/converge.yml      |   6 +-
 .../{user => users}/deleted/molecule.yml      |   0
 .../{route => users}/deleted/prepare.yml      |   6 +-
 .../molecule/{user => users}/deleted/vars.yml |   0
 .../{user => users}/deleted/verify.yml        |   6 +-
 .../merged => users/gathered}/cleanup.yml     |   4 +-
 .../{token => users}/gathered/converge.yml    |   6 +-
 .../{user => users}/gathered/molecule.yml     |   0
 .../replaced => users/gathered}/prepare.yml   |   6 +-
 .../{user => users}/gathered/vars.yml         |   0
 .../{user => users}/gathered/verify.yml       |   6 +-
 .../molecule/{user => users}/inventory.yml    |   0
 .../gathered => users/merged}/cleanup.yml     |   4 +-
 .../{user => users}/merged/converge.yml       |   6 +-
 .../{user => users}/merged/molecule.yml       |   0
 .../molecule/{user => users}/merged/vars.yml  |   0
 .../{user => users}/merged/verify.yml         |   6 +-
 .../molecule/users/overridden/cleanup.yml     |  19 ++
 .../{user => users}/overridden/converge.yml   |   6 +-
 .../{user => users}/overridden/molecule.yml   |   0
 .../{route => users}/overridden/prepare.yml   |   4 +-
 .../{user => users}/overridden/vars.yml       |   0
 .../{user => users}/overridden/verify.yml     |   6 +-
 .../overridden => users/replaced}/cleanup.yml |   4 +-
 .../{token => users}/replaced/converge.yml    |   6 +-
 .../{user => users}/replaced/molecule.yml     |   0
 .../gathered => users/replaced}/prepare.yml   |   6 +-
 .../{user => users}/replaced/vars.yml         |   0
 .../{user => users}/replaced/verify.yml       |   6 +-
 .../{application.py => applications.py}       |   6 +-
 ...nticator_user.py => authenticator_maps.py} |   6 +-
 ...nticator_map.py => authenticator_users.py} |   6 +-
 .../{authenticator.py => authenticators.py}   |   6 +-
 plugins/action/base_action.py                 |  25 +-
 .../{ca_certificate.py => ca_certificates.py} |   6 +-
 .../{feature_flag.py => feature_flags.py}     |   6 +-
 .../action/{http_port.py => http_ports.py}    |   6 +-
 .../{organization.py => organizations.py}     |   6 +-
 ...role_definition.py => role_definitions.py} |   6 +-
 ...assignment.py => role_team_assignments.py} |   6 +-
 ...assignment.py => role_user_assignments.py} |   6 +-
 plugins/action/{route.py => routes.py}        |   6 +-
 ...service_cluster.py => service_clusters.py} |   6 +-
 .../{service_key.py => service_keys.py}       |   6 +-
 .../{service_node.py => service_nodes.py}     |   6 +-
 .../{service_type.py => service_types.py}     |   6 +-
 plugins/action/{service.py => services.py}    |   6 +-
 plugins/action/settings.py                    |   2 +-
 plugins/action/{team.py => teams.py}          |   6 +-
 plugins/action/{user.py => tokens.py}         |   6 +-
 ...ui_plugin_route.py => ui_plugin_routes.py} |   6 +-
 plugins/action/{token.py => users.py}         |   6 +-
 .../{application.py => applications.py}       |  10 +-
 ...enticator_map.py => authenticator_maps.py} |  10 +-
 ...ticator_user.py => authenticator_users.py} |  10 +-
 .../{authenticator.py => authenticators.py}   |  10 +-
 .../{ca_certificate.py => ca_certificates.py} |  10 +-
 .../{feature_flag.py => feature_flags.py}     |  10 +-
 .../modules/{http_port.py => http_ports.py}   |  10 +-
 .../{organization.py => organizations.py}     |  10 +-
 ...role_definition.py => role_definitions.py} |  10 +-
 ...assignment.py => role_team_assignments.py} |  10 +-
 ...assignment.py => role_user_assignments.py} |  10 +-
 plugins/modules/{route.py => routes.py}       |  10 +-
 ...service_cluster.py => service_clusters.py} |  10 +-
 .../{service_key.py => service_keys.py}       |  10 +-
 .../{service_node.py => service_nodes.py}     |  10 +-
 .../{service_type.py => service_types.py}     |  10 +-
 plugins/modules/{service.py => services.py}   |  10 +-
 plugins/modules/{team.py => teams.py}         |  10 +-
 plugins/modules/{token.py => tokens.py}       |  10 +-
 ...ui_plugin_route.py => ui_plugin_routes.py} |  10 +-
 plugins/modules/{user.py => users.py}         |  10 +-
 .../{application.py => applications.py}       |   2 +-
 ...enticator_map.py => authenticator_maps.py} |   2 +-
 ...ticator_user.py => authenticator_users.py} |   2 +-
 .../{authenticator.py => authenticators.py}   |   2 +-
 .../{ca_certificate.py => ca_certificates.py} |   2 +-
 .../{feature_flag.py => feature_flags.py}     |   2 +-
 .../{http_port.py => http_ports.py}           |   2 +-
 .../{organization.py => organizations.py}     |   2 +-
 ...role_definition.py => role_definitions.py} |   2 +-
 ...assignment.py => role_team_assignments.py} |   2 +-
 ...assignment.py => role_user_assignments.py} |   2 +-
 .../ansible_models/{route.py => routes.py}    |   2 +-
 ...service_cluster.py => service_clusters.py} |   2 +-
 .../{service_key.py => service_keys.py}       |   2 +-
 .../{service_node.py => service_nodes.py}     |   2 +-
 .../{service_type.py => service_types.py}     |   2 +-
 .../{service.py => services.py}               |   2 +-
 .../plugin_utils/ansible_models/settings.py   |   2 +-
 .../ansible_models/{team.py => teams.py}      |   2 +-
 .../ansible_models/{token.py => tokens.py}    |   2 +-
 ...ui_plugin_route.py => ui_plugin_routes.py} |   2 +-
 .../ansible_models/{user.py => users.py}      |   2 +-
 plugins/plugin_utils/api/v1/application.py    |   4 +-
 plugins/plugin_utils/api/v1/authenticator.py  |   4 +-
 .../plugin_utils/api/v1/authenticator_map.py  |   4 +-
 .../plugin_utils/api/v1/authenticator_user.py |   4 +-
 plugins/plugin_utils/api/v1/ca_certificate.py |   4 +-
 plugins/plugin_utils/api/v1/feature_flag.py   |   4 +-
 plugins/plugin_utils/api/v1/http_port.py      |   4 +-
 plugins/plugin_utils/api/v1/organization.py   |   4 +-
 .../plugin_utils/api/v1/role_definition.py    |   4 +-
 .../api/v1/role_team_assignment.py            |   4 +-
 .../api/v1/role_user_assignment.py            |   4 +-
 plugins/plugin_utils/api/v1/route.py          |   4 +-
 plugins/plugin_utils/api/v1/service.py        |   4 +-
 .../plugin_utils/api/v1/service_cluster.py    |   4 +-
 plugins/plugin_utils/api/v1/service_key.py    |   4 +-
 plugins/plugin_utils/api/v1/service_node.py   |   4 +-
 plugins/plugin_utils/api/v1/service_type.py   |   4 +-
 plugins/plugin_utils/api/v1/settings.py       |   6 +-
 plugins/plugin_utils/api/v1/team.py           |   4 +-
 plugins/plugin_utils/api/v1/token.py          |   4 +-
 .../plugin_utils/api/v1/ui_plugin_route.py    |   4 +-
 plugins/plugin_utils/api/v1/user.py           |   4 +-
 plugins/plugin_utils/platform/loader.py       |  11 +-
 tools/generate_integration_tests.py           |  42 ++--
 793 files changed, 2987 insertions(+), 2882 deletions(-)
 rename extensions/molecule/{application => applications}/check/cleanup.yml (84%)
 rename extensions/molecule/{organization => applications}/check/converge.yml (86%)
 rename extensions/molecule/{application => applications}/check/molecule.yml (100%)
 rename extensions/molecule/{organization => applications}/check/prepare.yml (73%)
 rename extensions/molecule/{application => applications}/check/vars.yml (100%)
 rename extensions/molecule/{application => applications}/check/verify.yml (83%)
 rename extensions/molecule/{application => applications}/deleted/cleanup.yml (85%)
 rename extensions/molecule/{service_node => applications}/deleted/converge.yml (73%)
 rename extensions/molecule/{application => applications}/deleted/molecule.yml (100%)
 rename extensions/molecule/{organization => applications}/deleted/prepare.yml (72%)
 rename extensions/molecule/{application => applications}/deleted/vars.yml (100%)
 rename extensions/molecule/{application => applications}/deleted/verify.yml (82%)
 rename extensions/molecule/{application/overridden => applications/gathered}/cleanup.yml (84%)
 rename extensions/molecule/{service_node => applications}/gathered/converge.yml (73%)
 rename extensions/molecule/{application => applications}/gathered/molecule.yml (100%)
 rename extensions/molecule/{organization => applications}/gathered/prepare.yml (72%)
 rename extensions/molecule/{application => applications}/gathered/vars.yml (100%)
 rename extensions/molecule/{organization => applications}/gathered/verify.yml (82%)
 rename extensions/molecule/{application => applications}/inventory.yml (100%)
 rename extensions/molecule/{application/replaced => applications/merged}/cleanup.yml (84%)
 rename extensions/molecule/{application => applications}/merged/converge.yml (73%)
 rename extensions/molecule/{application => applications}/merged/molecule.yml (100%)
 rename extensions/molecule/{application => applications}/merged/vars.yml (100%)
 rename extensions/molecule/{application => applications}/merged/verify.yml (82%)
 rename extensions/molecule/{application/merged => applications/overridden}/cleanup.yml (84%)
 rename extensions/molecule/{service_node => applications}/overridden/converge.yml (73%)
 rename extensions/molecule/{application => applications}/overridden/molecule.yml (100%)
 rename extensions/molecule/{application => applications}/overridden/prepare.yml (84%)
 rename extensions/molecule/{application => applications}/overridden/vars.yml (100%)
 rename extensions/molecule/{application => applications}/overridden/verify.yml (87%)
 rename extensions/molecule/{application/gathered => applications/replaced}/cleanup.yml (84%)
 rename extensions/molecule/{organization => applications}/replaced/converge.yml (73%)
 rename extensions/molecule/{application => applications}/replaced/molecule.yml (100%)
 rename extensions/molecule/{organization => applications}/replaced/prepare.yml (72%)
 rename extensions/molecule/{application => applications}/replaced/vars.yml (100%)
 rename extensions/molecule/{application => applications}/replaced/verify.yml (87%)
 delete mode 100644 extensions/molecule/authenticator/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/authenticator_map/replaced/cleanup.yml
 rename extensions/molecule/{authenticator_map => authenticator_maps}/check/cleanup.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/check/converge.yml (85%)
 rename extensions/molecule/{authenticator => authenticator_maps}/check/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map/replaced => authenticator_maps/check}/prepare.yml (79%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/check/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/check/verify.yml (82%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/deleted/cleanup.yml (87%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/deleted/converge.yml (70%)
 rename extensions/molecule/{authenticator => authenticator_maps}/deleted/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map/gathered => authenticator_maps/deleted}/prepare.yml (79%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/deleted/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/deleted/verify.yml (80%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/gathered/cleanup.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/gathered/converge.yml (70%)
 rename extensions/molecule/{authenticator => authenticator_maps}/gathered/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map/check => authenticator_maps/gathered}/prepare.yml (79%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/gathered/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/gathered/verify.yml (80%)
 rename extensions/molecule/{authenticator => authenticator_maps}/inventory.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/merged/cleanup.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/merged/converge.yml (70%)
 rename extensions/molecule/{authenticator/overridden => authenticator_maps/merged}/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/merged/prepare.yml (85%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/merged/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/merged/verify.yml (80%)
 create mode 100644 extensions/molecule/authenticator_maps/overridden/cleanup.yml
 rename extensions/molecule/{authenticator_map => authenticator_maps}/overridden/converge.yml (70%)
 rename extensions/molecule/{authenticator/replaced => authenticator_maps/overridden}/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/overridden/prepare.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/overridden/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/overridden/verify.yml (86%)
 rename extensions/molecule/{authenticator_map/overridden => authenticator_maps/replaced}/cleanup.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/replaced/converge.yml (70%)
 rename extensions/molecule/{authenticator_map/deleted => authenticator_maps/replaced}/molecule.yml (100%)
 rename extensions/molecule/{authenticator_map/deleted => authenticator_maps/replaced}/prepare.yml (79%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/replaced/vars.yml (100%)
 rename extensions/molecule/{authenticator_map => authenticator_maps}/replaced/verify.yml (85%)
 rename extensions/molecule/{authenticator => authenticators}/check/cleanup.yml (84%)
 rename extensions/molecule/{ca_certificate => authenticators}/check/converge.yml (86%)
 rename extensions/molecule/{authenticator_map => authenticators}/check/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/check/prepare.yml (72%)
 rename extensions/molecule/{authenticator => authenticators}/check/vars.yml (100%)
 rename extensions/molecule/{authenticator => authenticators}/check/verify.yml (83%)
 rename extensions/molecule/{authenticator => authenticators}/deleted/cleanup.yml (84%)
 rename extensions/molecule/{ca_certificate => authenticators}/deleted/converge.yml (72%)
 rename extensions/molecule/{authenticator_map/gathered => authenticators/deleted}/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/deleted/prepare.yml (72%)
 rename extensions/molecule/{authenticator => authenticators}/deleted/vars.yml (100%)
 rename extensions/molecule/{authenticator => authenticators}/deleted/verify.yml (81%)
 rename extensions/molecule/{authenticator/merged => authenticators/gathered}/cleanup.yml (83%)
 rename extensions/molecule/{ca_certificate => authenticators}/gathered/converge.yml (72%)
 rename extensions/molecule/{authenticator_map/merged => authenticators/gathered}/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/gathered/prepare.yml (71%)
 rename extensions/molecule/{authenticator => authenticators}/gathered/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/gathered/verify.yml (82%)
 rename extensions/molecule/{authenticator_map => authenticators}/inventory.yml (100%)
 rename extensions/molecule/{authenticator/gathered => authenticators/merged}/cleanup.yml (84%)
 rename extensions/molecule/{ca_certificate => authenticators}/merged/converge.yml (72%)
 rename extensions/molecule/{authenticator => authenticators}/merged/molecule.yml (100%)
 rename extensions/molecule/{authenticator => authenticators}/merged/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/merged/verify.yml (82%)
 create mode 100644 extensions/molecule/authenticators/overridden/cleanup.yml
 rename extensions/molecule/{ca_certificate => authenticators}/overridden/converge.yml (72%)
 rename extensions/molecule/{authenticator_map => authenticators}/overridden/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/overridden/prepare.yml (83%)
 rename extensions/molecule/{authenticator => authenticators}/overridden/vars.yml (100%)
 rename extensions/molecule/{authenticator => authenticators}/overridden/verify.yml (86%)
 rename extensions/molecule/{authenticator/overridden => authenticators/replaced}/cleanup.yml (83%)
 rename extensions/molecule/{ca_certificate => authenticators}/replaced/converge.yml (72%)
 rename extensions/molecule/{authenticator_map => authenticators}/replaced/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => authenticators}/replaced/prepare.yml (71%)
 rename extensions/molecule/{authenticator => authenticators}/replaced/vars.yml (100%)
 rename extensions/molecule/{authenticator => authenticators}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/ca_certificate/replaced/cleanup.yml
 rename extensions/molecule/{ca_certificate => ca_certificates}/check/cleanup.yml (84%)
 rename extensions/molecule/{role_definition => ca_certificates}/check/converge.yml (86%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/check/molecule.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/check/prepare.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/check/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/check/verify.yml (83%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/deleted/cleanup.yml (84%)
 rename extensions/molecule/{role_definition => ca_certificates}/deleted/converge.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/deleted/molecule.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/deleted/prepare.yml (71%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/deleted/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/deleted/verify.yml (81%)
 rename extensions/molecule/{ca_certificate/merged => ca_certificates/gathered}/cleanup.yml (83%)
 rename extensions/molecule/{role_definition => ca_certificates}/gathered/converge.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/gathered/molecule.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/gathered/prepare.yml (71%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/gathered/vars.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/gathered/verify.yml (81%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/inventory.yml (100%)
 rename extensions/molecule/{ca_certificate/gathered => ca_certificates/merged}/cleanup.yml (83%)
 rename extensions/molecule/{role_definition => ca_certificates}/merged/converge.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/merged/molecule.yml (100%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/merged/vars.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/merged/verify.yml (81%)
 create mode 100644 extensions/molecule/ca_certificates/overridden/cleanup.yml
 rename extensions/molecule/{role_definition => ca_certificates}/overridden/converge.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/ca_certificates/overridden/prepare.yml
 rename extensions/molecule/{ca_certificate => ca_certificates}/overridden/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/overridden/verify.yml (86%)
 rename extensions/molecule/{ca_certificate/overridden => ca_certificates/replaced}/cleanup.yml (83%)
 rename extensions/molecule/{role_definition => ca_certificates}/replaced/converge.yml (72%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/replaced/molecule.yml (100%)
 rename extensions/molecule/{role_definition => ca_certificates}/replaced/prepare.yml (71%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/replaced/vars.yml (100%)
 rename extensions/molecule/{ca_certificate => ca_certificates}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/http_port/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/http_port/replaced/prepare.yml
 rename extensions/molecule/{http_port => http_ports}/check/cleanup.yml (85%)
 rename extensions/molecule/{http_port => http_ports}/check/converge.yml (87%)
 rename extensions/molecule/{http_port => http_ports}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/http_ports/check/prepare.yml
 rename extensions/molecule/{http_port => http_ports}/check/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/check/verify.yml (84%)
 rename extensions/molecule/{http_port => http_ports}/deleted/cleanup.yml (85%)
 rename extensions/molecule/{http_port => http_ports}/deleted/converge.yml (73%)
 rename extensions/molecule/{http_port => http_ports}/deleted/molecule.yml (100%)
 rename extensions/molecule/{http_port/gathered => http_ports/deleted}/prepare.yml (71%)
 rename extensions/molecule/{http_port => http_ports}/deleted/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/deleted/verify.yml (82%)
 rename extensions/molecule/{http_port => http_ports}/gathered/cleanup.yml (85%)
 rename extensions/molecule/{http_port => http_ports}/gathered/converge.yml (73%)
 rename extensions/molecule/{http_port => http_ports}/gathered/molecule.yml (100%)
 rename extensions/molecule/{http_port/check => http_ports/gathered}/prepare.yml (71%)
 rename extensions/molecule/{http_port => http_ports}/gathered/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/gathered/verify.yml (82%)
 rename extensions/molecule/{http_port => http_ports}/inventory.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/merged/cleanup.yml (85%)
 rename extensions/molecule/{http_port => http_ports}/merged/converge.yml (74%)
 rename extensions/molecule/{http_port => http_ports}/merged/molecule.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/merged/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/merged/verify.yml (83%)
 create mode 100644 extensions/molecule/http_ports/overridden/cleanup.yml
 rename extensions/molecule/{http_port => http_ports}/overridden/converge.yml (73%)
 rename extensions/molecule/{http_port => http_ports}/overridden/molecule.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/overridden/prepare.yml (84%)
 rename extensions/molecule/{http_port => http_ports}/overridden/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/overridden/verify.yml (87%)
 rename extensions/molecule/{http_port/overridden => http_ports/replaced}/cleanup.yml (85%)
 rename extensions/molecule/{http_port => http_ports}/replaced/converge.yml (73%)
 rename extensions/molecule/{http_port => http_ports}/replaced/molecule.yml (100%)
 rename extensions/molecule/{application/deleted => http_ports/replaced}/prepare.yml (71%)
 rename extensions/molecule/{http_port => http_ports}/replaced/vars.yml (100%)
 rename extensions/molecule/{http_port => http_ports}/replaced/verify.yml (87%)
 delete mode 100644 extensions/molecule/organization/replaced/cleanup.yml
 rename extensions/molecule/{organization => organizations}/check/cleanup.yml (84%)
 rename extensions/molecule/{authenticator => organizations}/check/converge.yml (86%)
 rename extensions/molecule/{organization => organizations}/check/molecule.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/check/prepare.yml (72%)
 rename extensions/molecule/{organization => organizations}/check/vars.yml (100%)
 rename extensions/molecule/{organization => organizations}/check/verify.yml (83%)
 rename extensions/molecule/{organization => organizations}/deleted/cleanup.yml (84%)
 rename extensions/molecule/{authenticator => organizations}/deleted/converge.yml (73%)
 rename extensions/molecule/{organization => organizations}/deleted/molecule.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/deleted/prepare.yml (72%)
 rename extensions/molecule/{organization => organizations}/deleted/vars.yml (100%)
 rename extensions/molecule/{organization => organizations}/deleted/verify.yml (81%)
 rename extensions/molecule/{organization/merged => organizations/gathered}/cleanup.yml (84%)
 rename extensions/molecule/{authenticator => organizations}/gathered/converge.yml (73%)
 rename extensions/molecule/{organization => organizations}/gathered/molecule.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/gathered/prepare.yml (72%)
 rename extensions/molecule/{organization => organizations}/gathered/vars.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/gathered/verify.yml (82%)
 rename extensions/molecule/{organization => organizations}/inventory.yml (100%)
 rename extensions/molecule/{organization/gathered => organizations/merged}/cleanup.yml (84%)
 rename extensions/molecule/{authenticator => organizations}/merged/converge.yml (73%)
 rename extensions/molecule/{organization => organizations}/merged/molecule.yml (100%)
 rename extensions/molecule/{organization => organizations}/merged/vars.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/merged/verify.yml (82%)
 create mode 100644 extensions/molecule/organizations/overridden/cleanup.yml
 rename extensions/molecule/{authenticator => organizations}/overridden/converge.yml (72%)
 rename extensions/molecule/{organization => organizations}/overridden/molecule.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/overridden/prepare.yml (83%)
 rename extensions/molecule/{organization => organizations}/overridden/vars.yml (100%)
 rename extensions/molecule/{organization => organizations}/overridden/verify.yml (86%)
 rename extensions/molecule/{organization/overridden => organizations/replaced}/cleanup.yml (84%)
 rename extensions/molecule/{authenticator => organizations}/replaced/converge.yml (73%)
 rename extensions/molecule/{organization => organizations}/replaced/molecule.yml (100%)
 rename extensions/molecule/{authenticator => organizations}/replaced/prepare.yml (72%)
 rename extensions/molecule/{organization => organizations}/replaced/vars.yml (100%)
 rename extensions/molecule/{organization => organizations}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/role_definition/overridden/prepare.yml
 delete mode 100644 extensions/molecule/role_definition/replaced/cleanup.yml
 rename extensions/molecule/{role_definition => role_definitions}/check/cleanup.yml (83%)
 create mode 100644 extensions/molecule/role_definitions/check/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/check/prepare.yml
 rename extensions/molecule/{role_definition => role_definitions}/check/vars.yml (100%)
 rename extensions/molecule/{role_definition => role_definitions}/check/verify.yml (82%)
 rename extensions/molecule/{role_definition => role_definitions}/deleted/cleanup.yml (84%)
 create mode 100644 extensions/molecule/role_definitions/deleted/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/deleted/molecule.yml (100%)
 rename extensions/molecule/{application/gathered => role_definitions/deleted}/prepare.yml (69%)
 rename extensions/molecule/{role_definition => role_definitions}/deleted/vars.yml (100%)
 rename extensions/molecule/{role_definition => role_definitions}/deleted/verify.yml (81%)
 rename extensions/molecule/{role_definition/merged => role_definitions/gathered}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/role_definitions/gathered/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/gathered/prepare.yml
 rename extensions/molecule/{role_definition => role_definitions}/gathered/vars.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/gathered/verify.yml
 rename extensions/molecule/{role_definition => role_definitions}/inventory.yml (100%)
 rename extensions/molecule/{role_definition/gathered => role_definitions/merged}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/role_definitions/merged/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/merged/molecule.yml (100%)
 rename extensions/molecule/{role_definition => role_definitions}/merged/vars.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/merged/verify.yml
 create mode 100644 extensions/molecule/role_definitions/overridden/cleanup.yml
 create mode 100644 extensions/molecule/role_definitions/overridden/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/overridden/prepare.yml
 rename extensions/molecule/{role_definition => role_definitions}/overridden/vars.yml (100%)
 rename extensions/molecule/{role_definition => role_definitions}/overridden/verify.yml (86%)
 rename extensions/molecule/{role_definition/overridden => role_definitions/replaced}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/role_definitions/replaced/converge.yml
 rename extensions/molecule/{role_definition => role_definitions}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/role_definitions/replaced/prepare.yml
 rename extensions/molecule/{role_definition => role_definitions}/replaced/vars.yml (100%)
 rename extensions/molecule/{role_definition => role_definitions}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/route/replaced/cleanup.yml
 rename extensions/molecule/{route/merged => routes/check}/cleanup.yml (86%)
 rename extensions/molecule/{user => routes}/check/converge.yml (87%)
 rename extensions/molecule/{route => routes}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/routes/check/prepare.yml
 rename extensions/molecule/{route => routes}/check/vars.yml (100%)
 rename extensions/molecule/{route => routes}/check/verify.yml (85%)
 rename extensions/molecule/{route => routes}/deleted/cleanup.yml (87%)
 rename extensions/molecule/{user => routes}/deleted/converge.yml (75%)
 rename extensions/molecule/{route => routes}/deleted/molecule.yml (100%)
 rename extensions/molecule/{team/gathered => routes/deleted}/prepare.yml (73%)
 rename extensions/molecule/{route => routes}/deleted/vars.yml (100%)
 rename extensions/molecule/{route => routes}/deleted/verify.yml (84%)
 rename extensions/molecule/{route/overridden => routes/gathered}/cleanup.yml (86%)
 rename extensions/molecule/{user => routes}/gathered/converge.yml (75%)
 rename extensions/molecule/{route => routes}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/routes/gathered/prepare.yml
 rename extensions/molecule/{route => routes}/gathered/vars.yml (100%)
 rename extensions/molecule/{route => routes}/gathered/verify.yml (84%)
 rename extensions/molecule/{route => routes}/inventory.yml (100%)
 rename extensions/molecule/{route/gathered => routes/merged}/cleanup.yml (86%)
 rename extensions/molecule/{team => routes}/merged/converge.yml (75%)
 rename extensions/molecule/{route => routes}/merged/molecule.yml (100%)
 rename extensions/molecule/{route => routes}/merged/vars.yml (100%)
 rename extensions/molecule/{team => routes}/merged/verify.yml (84%)
 create mode 100644 extensions/molecule/routes/overridden/cleanup.yml
 rename extensions/molecule/{team => routes}/overridden/converge.yml (74%)
 rename extensions/molecule/{route => routes}/overridden/molecule.yml (100%)
 rename extensions/molecule/{user => routes}/overridden/prepare.yml (86%)
 rename extensions/molecule/{route => routes}/overridden/vars.yml (100%)
 rename extensions/molecule/{route => routes}/overridden/verify.yml (88%)
 rename extensions/molecule/{route/check => routes/replaced}/cleanup.yml (86%)
 rename extensions/molecule/{user => routes}/replaced/converge.yml (75%)
 rename extensions/molecule/{route => routes}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/routes/replaced/prepare.yml
 rename extensions/molecule/{route => routes}/replaced/vars.yml (100%)
 rename extensions/molecule/{route => routes}/replaced/verify.yml (88%)
 delete mode 100644 extensions/molecule/service/check/prepare.yml
 delete mode 100644 extensions/molecule/service/deleted/prepare.yml
 delete mode 100644 extensions/molecule/service/gathered/prepare.yml
 delete mode 100644 extensions/molecule/service/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/service/replaced/prepare.yml
 delete mode 100644 extensions/molecule/service_cluster/check/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/check/prepare.yml
 delete mode 100644 extensions/molecule/service_cluster/deleted/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/deleted/prepare.yml
 delete mode 100644 extensions/molecule/service_cluster/gathered/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/gathered/prepare.yml
 delete mode 100644 extensions/molecule/service_cluster/gathered/verify.yml
 delete mode 100644 extensions/molecule/service_cluster/merged/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/merged/verify.yml
 delete mode 100644 extensions/molecule/service_cluster/overridden/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/overridden/prepare.yml
 delete mode 100644 extensions/molecule/service_cluster/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/service_cluster/replaced/converge.yml
 delete mode 100644 extensions/molecule/service_cluster/replaced/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/check/cleanup.yml (83%)
 create mode 100644 extensions/molecule/service_clusters/check/converge.yml
 rename extensions/molecule/{service => service_clusters}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/check/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/check/vars.yml (100%)
 rename extensions/molecule/{service_cluster => service_clusters}/check/verify.yml (83%)
 rename extensions/molecule/{service_cluster => service_clusters}/deleted/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_clusters/deleted/converge.yml
 rename extensions/molecule/{service => service_clusters}/deleted/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/deleted/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/deleted/vars.yml (100%)
 rename extensions/molecule/{service_cluster => service_clusters}/deleted/verify.yml (81%)
 rename extensions/molecule/{service_cluster/merged => service_clusters/gathered}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/service_clusters/gathered/converge.yml
 rename extensions/molecule/{service => service_clusters}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/gathered/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/gathered/vars.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/gathered/verify.yml
 rename extensions/molecule/{service => service_clusters}/inventory.yml (100%)
 rename extensions/molecule/{service_cluster/gathered => service_clusters/merged}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/service_clusters/merged/converge.yml
 rename extensions/molecule/{service => service_clusters}/merged/molecule.yml (100%)
 rename extensions/molecule/{service_cluster => service_clusters}/merged/vars.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/merged/verify.yml
 create mode 100644 extensions/molecule/service_clusters/overridden/cleanup.yml
 create mode 100644 extensions/molecule/service_clusters/overridden/converge.yml
 rename extensions/molecule/{service => service_clusters}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/overridden/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/overridden/vars.yml (100%)
 rename extensions/molecule/{service_cluster => service_clusters}/overridden/verify.yml (86%)
 rename extensions/molecule/{service_cluster/overridden => service_clusters/replaced}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/service_clusters/replaced/converge.yml
 rename extensions/molecule/{service => service_clusters}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_clusters/replaced/prepare.yml
 rename extensions/molecule/{service_cluster => service_clusters}/replaced/vars.yml (100%)
 rename extensions/molecule/{service_cluster => service_clusters}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/service_key/check/converge.yml
 delete mode 100644 extensions/molecule/service_key/check/prepare.yml
 delete mode 100644 extensions/molecule/service_key/deleted/converge.yml
 delete mode 100644 extensions/molecule/service_key/deleted/prepare.yml
 delete mode 100644 extensions/molecule/service_key/gathered/converge.yml
 delete mode 100644 extensions/molecule/service_key/gathered/prepare.yml
 delete mode 100644 extensions/molecule/service_key/gathered/verify.yml
 delete mode 100644 extensions/molecule/service_key/merged/converge.yml
 delete mode 100644 extensions/molecule/service_key/merged/verify.yml
 delete mode 100644 extensions/molecule/service_key/overridden/converge.yml
 delete mode 100644 extensions/molecule/service_key/overridden/prepare.yml
 delete mode 100644 extensions/molecule/service_key/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/service_key/replaced/converge.yml
 delete mode 100644 extensions/molecule/service_key/replaced/prepare.yml
 rename extensions/molecule/{service_key => service_keys}/check/cleanup.yml (84%)
 rename extensions/molecule/{application => service_keys}/check/converge.yml (86%)
 rename extensions/molecule/{service_cluster => service_keys}/check/molecule.yml (100%)
 rename extensions/molecule/{service_node => service_keys}/check/prepare.yml (73%)
 rename extensions/molecule/{service_key => service_keys}/check/vars.yml (100%)
 rename extensions/molecule/{service_key => service_keys}/check/verify.yml (83%)
 rename extensions/molecule/{service_key => service_keys}/deleted/cleanup.yml (85%)
 rename extensions/molecule/{service_type => service_keys}/deleted/converge.yml (73%)
 rename extensions/molecule/{service_cluster => service_keys}/deleted/molecule.yml (100%)
 rename extensions/molecule/{service_node => service_keys}/deleted/prepare.yml (72%)
 rename extensions/molecule/{service_key => service_keys}/deleted/vars.yml (100%)
 rename extensions/molecule/{service_key => service_keys}/deleted/verify.yml (82%)
 rename extensions/molecule/{service_key/merged => service_keys/gathered}/cleanup.yml (84%)
 rename extensions/molecule/{organization => service_keys}/gathered/converge.yml (73%)
 rename extensions/molecule/{service_cluster => service_keys}/gathered/molecule.yml (100%)
 rename extensions/molecule/{service_node => service_keys}/gathered/prepare.yml (72%)
 rename extensions/molecule/{service_key => service_keys}/gathered/vars.yml (100%)
 rename extensions/molecule/{application => service_keys}/gathered/verify.yml (82%)
 rename extensions/molecule/{service_cluster => service_keys}/inventory.yml (100%)
 rename extensions/molecule/{service_key/gathered => service_keys/merged}/cleanup.yml (84%)
 rename extensions/molecule/{organization => service_keys}/merged/converge.yml (73%)
 rename extensions/molecule/{service_cluster => service_keys}/merged/molecule.yml (100%)
 rename extensions/molecule/{service_key => service_keys}/merged/vars.yml (100%)
 rename extensions/molecule/{organization => service_keys}/merged/verify.yml (82%)
 create mode 100644 extensions/molecule/service_keys/overridden/cleanup.yml
 rename extensions/molecule/{service_type => service_keys}/overridden/converge.yml (73%)
 rename extensions/molecule/{service_cluster => service_keys}/overridden/molecule.yml (100%)
 rename extensions/molecule/{organization => service_keys}/overridden/prepare.yml (84%)
 rename extensions/molecule/{service_key => service_keys}/overridden/vars.yml (100%)
 rename extensions/molecule/{service_key => service_keys}/overridden/verify.yml (87%)
 rename extensions/molecule/{service_key/overridden => service_keys/replaced}/cleanup.yml (84%)
 rename extensions/molecule/{service_node => service_keys}/replaced/converge.yml (73%)
 rename extensions/molecule/{service_cluster => service_keys}/replaced/molecule.yml (100%)
 rename extensions/molecule/{service_node => service_keys}/replaced/prepare.yml (72%)
 rename extensions/molecule/{service_key => service_keys}/replaced/vars.yml (100%)
 rename extensions/molecule/{service_key => service_keys}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/service_node/check/converge.yml
 delete mode 100644 extensions/molecule/service_node/gathered/verify.yml
 delete mode 100644 extensions/molecule/service_node/merged/converge.yml
 delete mode 100644 extensions/molecule/service_node/merged/verify.yml
 delete mode 100644 extensions/molecule/service_node/overridden/prepare.yml
 delete mode 100644 extensions/molecule/service_node/replaced/cleanup.yml
 rename extensions/molecule/{service_node => service_nodes}/check/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_nodes/check/converge.yml
 rename extensions/molecule/{service_key => service_nodes}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/check/prepare.yml
 rename extensions/molecule/{service_node => service_nodes}/check/vars.yml (100%)
 rename extensions/molecule/{service_node => service_nodes}/check/verify.yml (83%)
 rename extensions/molecule/{service_node => service_nodes}/deleted/cleanup.yml (85%)
 rename extensions/molecule/{organization => service_nodes}/deleted/converge.yml (72%)
 rename extensions/molecule/{service_key => service_nodes}/deleted/molecule.yml (100%)
 rename extensions/molecule/{application/replaced => service_nodes/deleted}/prepare.yml (70%)
 rename extensions/molecule/{service_node => service_nodes}/deleted/vars.yml (100%)
 rename extensions/molecule/{service_node => service_nodes}/deleted/verify.yml (81%)
 rename extensions/molecule/{service_node/merged => service_nodes/gathered}/cleanup.yml (84%)
 rename extensions/molecule/{application => service_nodes}/gathered/converge.yml (72%)
 rename extensions/molecule/{service_key => service_nodes}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/gathered/prepare.yml
 rename extensions/molecule/{service_node => service_nodes}/gathered/vars.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/gathered/verify.yml
 rename extensions/molecule/{service_key => service_nodes}/inventory.yml (100%)
 rename extensions/molecule/{service_node/gathered => service_nodes/merged}/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_nodes/merged/converge.yml
 rename extensions/molecule/{service_key => service_nodes}/merged/molecule.yml (100%)
 rename extensions/molecule/{service_node => service_nodes}/merged/vars.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/merged/verify.yml
 create mode 100644 extensions/molecule/service_nodes/overridden/cleanup.yml
 rename extensions/molecule/{application => service_nodes}/overridden/converge.yml (72%)
 rename extensions/molecule/{service_key => service_nodes}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/overridden/prepare.yml
 rename extensions/molecule/{service_node => service_nodes}/overridden/vars.yml (100%)
 rename extensions/molecule/{service_node => service_nodes}/overridden/verify.yml (86%)
 rename extensions/molecule/{service_node/overridden => service_nodes/replaced}/cleanup.yml (84%)
 rename extensions/molecule/{application => service_nodes}/replaced/converge.yml (72%)
 rename extensions/molecule/{service_key => service_nodes}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_nodes/replaced/prepare.yml
 rename extensions/molecule/{service_node => service_nodes}/replaced/vars.yml (100%)
 rename extensions/molecule/{service_node => service_nodes}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/service_type/check/converge.yml
 delete mode 100644 extensions/molecule/service_type/check/prepare.yml
 delete mode 100644 extensions/molecule/service_type/deleted/prepare.yml
 delete mode 100644 extensions/molecule/service_type/gathered/converge.yml
 delete mode 100644 extensions/molecule/service_type/gathered/prepare.yml
 delete mode 100644 extensions/molecule/service_type/gathered/verify.yml
 delete mode 100644 extensions/molecule/service_type/merged/converge.yml
 delete mode 100644 extensions/molecule/service_type/merged/verify.yml
 delete mode 100644 extensions/molecule/service_type/overridden/prepare.yml
 delete mode 100644 extensions/molecule/service_type/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/service_type/replaced/converge.yml
 delete mode 100644 extensions/molecule/service_type/replaced/prepare.yml
 rename extensions/molecule/{service_type => service_types}/check/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_types/check/converge.yml
 rename extensions/molecule/{service_node => service_types}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_types/check/prepare.yml
 rename extensions/molecule/{service_type => service_types}/check/vars.yml (100%)
 rename extensions/molecule/{service_type => service_types}/check/verify.yml (83%)
 rename extensions/molecule/{service_type => service_types}/deleted/cleanup.yml (85%)
 rename extensions/molecule/{application => service_types}/deleted/converge.yml (72%)
 rename extensions/molecule/{service_node => service_types}/deleted/molecule.yml (100%)
 rename extensions/molecule/{application/check => service_types/deleted}/prepare.yml (70%)
 rename extensions/molecule/{service_type => service_types}/deleted/vars.yml (100%)
 rename extensions/molecule/{service_type => service_types}/deleted/verify.yml (81%)
 rename extensions/molecule/{service_type/merged => service_types/gathered}/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_types/gathered/converge.yml
 rename extensions/molecule/{service_node => service_types}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_types/gathered/prepare.yml
 rename extensions/molecule/{service_type => service_types}/gathered/vars.yml (100%)
 create mode 100644 extensions/molecule/service_types/gathered/verify.yml
 rename extensions/molecule/{service_node => service_types}/inventory.yml (100%)
 rename extensions/molecule/{service_type/gathered => service_types/merged}/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_types/merged/converge.yml
 rename extensions/molecule/{service_node => service_types}/merged/molecule.yml (100%)
 rename extensions/molecule/{service_type => service_types}/merged/vars.yml (100%)
 create mode 100644 extensions/molecule/service_types/merged/verify.yml
 create mode 100644 extensions/molecule/service_types/overridden/cleanup.yml
 rename extensions/molecule/{organization => service_types}/overridden/converge.yml (72%)
 rename extensions/molecule/{service_node => service_types}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_types/overridden/prepare.yml
 rename extensions/molecule/{service_type => service_types}/overridden/vars.yml (100%)
 rename extensions/molecule/{service_type => service_types}/overridden/verify.yml (86%)
 rename extensions/molecule/{service_type/overridden => service_types/replaced}/cleanup.yml (84%)
 create mode 100644 extensions/molecule/service_types/replaced/converge.yml
 rename extensions/molecule/{service_node => service_types}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/service_types/replaced/prepare.yml
 rename extensions/molecule/{service_type => service_types}/replaced/vars.yml (100%)
 rename extensions/molecule/{service_type => service_types}/replaced/verify.yml (86%)
 rename extensions/molecule/{service => services}/check/cleanup.yml (86%)
 rename extensions/molecule/{service => services}/check/converge.yml (87%)
 rename extensions/molecule/{service_type => services}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/services/check/prepare.yml
 rename extensions/molecule/{service => services}/check/vars.yml (100%)
 rename extensions/molecule/{service => services}/check/verify.yml (84%)
 rename extensions/molecule/{service => services}/deleted/cleanup.yml (86%)
 rename extensions/molecule/{service => services}/deleted/converge.yml (74%)
 rename extensions/molecule/{service_type => services}/deleted/molecule.yml (100%)
 create mode 100644 extensions/molecule/services/deleted/prepare.yml
 rename extensions/molecule/{service => services}/deleted/vars.yml (100%)
 rename extensions/molecule/{service => services}/deleted/verify.yml (83%)
 rename extensions/molecule/{service/merged => services/gathered}/cleanup.yml (85%)
 rename extensions/molecule/{service => services}/gathered/converge.yml (74%)
 rename extensions/molecule/{service_type => services}/gathered/molecule.yml (100%)
 rename extensions/molecule/{http_port/deleted => services/gathered}/prepare.yml (72%)
 rename extensions/molecule/{service => services}/gathered/vars.yml (100%)
 rename extensions/molecule/{service => services}/gathered/verify.yml (83%)
 rename extensions/molecule/{service_type => services}/inventory.yml (100%)
 rename extensions/molecule/{service/gathered => services/merged}/cleanup.yml (86%)
 rename extensions/molecule/{service => services}/merged/converge.yml (74%)
 rename extensions/molecule/{service_type => services}/merged/molecule.yml (100%)
 rename extensions/molecule/{service => services}/merged/vars.yml (100%)
 rename extensions/molecule/{service => services}/merged/verify.yml (83%)
 create mode 100644 extensions/molecule/services/overridden/cleanup.yml
 rename extensions/molecule/{service => services}/overridden/converge.yml (74%)
 rename extensions/molecule/{service_type => services}/overridden/molecule.yml (100%)
 rename extensions/molecule/{service => services}/overridden/prepare.yml (85%)
 rename extensions/molecule/{service => services}/overridden/vars.yml (100%)
 rename extensions/molecule/{service => services}/overridden/verify.yml (87%)
 rename extensions/molecule/{service/overridden => services/replaced}/cleanup.yml (85%)
 rename extensions/molecule/{service => services}/replaced/converge.yml (74%)
 rename extensions/molecule/{service_type => services}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/services/replaced/prepare.yml
 rename extensions/molecule/{service => services}/replaced/vars.yml (100%)
 rename extensions/molecule/{service => services}/replaced/verify.yml (88%)
 delete mode 100644 extensions/molecule/team/check/prepare.yml
 delete mode 100644 extensions/molecule/team/replaced/cleanup.yml
 rename extensions/molecule/{team/merged => teams/check}/cleanup.yml (87%)
 rename extensions/molecule/{route => teams}/check/converge.yml (88%)
 rename extensions/molecule/{team => teams}/check/molecule.yml (100%)
 rename extensions/molecule/{token => teams}/check/prepare.yml (74%)
 rename extensions/molecule/{team => teams}/check/vars.yml (100%)
 rename extensions/molecule/{team => teams}/check/verify.yml (85%)
 rename extensions/molecule/{team => teams}/deleted/cleanup.yml (87%)
 rename extensions/molecule/{route => teams}/deleted/converge.yml (75%)
 rename extensions/molecule/{team => teams}/deleted/molecule.yml (100%)
 rename extensions/molecule/{team => teams}/deleted/prepare.yml (74%)
 rename extensions/molecule/{team => teams}/deleted/vars.yml (100%)
 rename extensions/molecule/{team => teams}/deleted/verify.yml (84%)
 rename extensions/molecule/{team => teams}/gathered/cleanup.yml (86%)
 rename extensions/molecule/{team => teams}/gathered/converge.yml (75%)
 rename extensions/molecule/{team => teams}/gathered/molecule.yml (100%)
 rename extensions/molecule/{route/replaced => teams/gathered}/prepare.yml (74%)
 rename extensions/molecule/{team => teams}/gathered/vars.yml (100%)
 rename extensions/molecule/{team => teams}/gathered/verify.yml (84%)
 rename extensions/molecule/{team => teams}/inventory.yml (100%)
 rename extensions/molecule/{team/check => teams/merged}/cleanup.yml (87%)
 rename extensions/molecule/{route => teams}/merged/converge.yml (76%)
 rename extensions/molecule/{team => teams}/merged/molecule.yml (100%)
 rename extensions/molecule/{team => teams}/merged/vars.yml (100%)
 rename extensions/molecule/{route => teams}/merged/verify.yml (84%)
 create mode 100644 extensions/molecule/teams/overridden/cleanup.yml
 rename extensions/molecule/{route => teams}/overridden/converge.yml (75%)
 rename extensions/molecule/{team => teams}/overridden/molecule.yml (100%)
 rename extensions/molecule/{team => teams}/overridden/prepare.yml (86%)
 rename extensions/molecule/{team => teams}/overridden/vars.yml (100%)
 rename extensions/molecule/{team => teams}/overridden/verify.yml (88%)
 rename extensions/molecule/{team/overridden => teams/replaced}/cleanup.yml (86%)
 rename extensions/molecule/{route => teams}/replaced/converge.yml (75%)
 rename extensions/molecule/{team => teams}/replaced/molecule.yml (100%)
 rename extensions/molecule/{token/gathered => teams/replaced}/prepare.yml (74%)
 rename extensions/molecule/{team => teams}/replaced/vars.yml (100%)
 rename extensions/molecule/{team => teams}/replaced/verify.yml (88%)
 delete mode 100644 extensions/molecule/token/deleted/prepare.yml
 delete mode 100644 extensions/molecule/token/overridden/.verify.yml.swp
 delete mode 100644 extensions/molecule/token/replaced/cleanup.yml
 rename extensions/molecule/{token => tokens}/check/cleanup.yml (86%)
 rename extensions/molecule/{token => tokens}/check/converge.yml (87%)
 rename extensions/molecule/{token => tokens}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/tokens/check/prepare.yml
 rename extensions/molecule/{token => tokens}/check/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/check/verify.yml (85%)
 rename extensions/molecule/{token => tokens}/deleted/cleanup.yml (86%)
 rename extensions/molecule/{token => tokens}/deleted/converge.yml (75%)
 rename extensions/molecule/{token => tokens}/deleted/molecule.yml (100%)
 rename extensions/molecule/{team/replaced => tokens/deleted}/prepare.yml (73%)
 rename extensions/molecule/{token => tokens}/deleted/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/deleted/verify.yml (84%)
 rename extensions/molecule/{token/merged => tokens/gathered}/cleanup.yml (86%)
 rename extensions/molecule/{route => tokens}/gathered/converge.yml (75%)
 rename extensions/molecule/{token => tokens}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/tokens/gathered/prepare.yml
 rename extensions/molecule/{token => tokens}/gathered/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/gathered/verify.yml (84%)
 rename extensions/molecule/{token => tokens}/inventory.yml (100%)
 rename extensions/molecule/{token/gathered => tokens/merged}/cleanup.yml (86%)
 rename extensions/molecule/{token => tokens}/merged/converge.yml (75%)
 rename extensions/molecule/{token => tokens}/merged/molecule.yml (100%)
 rename extensions/molecule/{token => tokens}/merged/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/merged/verify.yml (84%)
 create mode 100644 extensions/molecule/tokens/overridden/cleanup.yml
 rename extensions/molecule/{token => tokens}/overridden/converge.yml (74%)
 rename extensions/molecule/{token => tokens}/overridden/molecule.yml (100%)
 rename extensions/molecule/{token => tokens}/overridden/prepare.yml (86%)
 rename extensions/molecule/{token => tokens}/overridden/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/overridden/verify.yml (88%)
 rename extensions/molecule/{token/overridden => tokens/replaced}/cleanup.yml (86%)
 rename extensions/molecule/{team => tokens}/replaced/converge.yml (75%)
 rename extensions/molecule/{token => tokens}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/tokens/replaced/prepare.yml
 rename extensions/molecule/{token => tokens}/replaced/vars.yml (100%)
 rename extensions/molecule/{token => tokens}/replaced/verify.yml (88%)
 delete mode 100644 extensions/molecule/ui_plugin_route/check/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/check/prepare.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/deleted/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/deleted/prepare.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/gathered/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/gathered/prepare.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/gathered/verify.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/merged/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/merged/verify.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/overridden/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/overridden/prepare.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/replaced/converge.yml
 delete mode 100644 extensions/molecule/ui_plugin_route/replaced/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/check/cleanup.yml (83%)
 create mode 100644 extensions/molecule/ui_plugin_routes/check/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/check/molecule.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/check/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/check/vars.yml (100%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/check/verify.yml (82%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/deleted/cleanup.yml (84%)
 create mode 100644 extensions/molecule/ui_plugin_routes/deleted/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/deleted/molecule.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/deleted/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/deleted/vars.yml (100%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/deleted/verify.yml (81%)
 rename extensions/molecule/{ui_plugin_route/merged => ui_plugin_routes/gathered}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/ui_plugin_routes/gathered/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/gathered/molecule.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/gathered/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/gathered/vars.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/gathered/verify.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/inventory.yml (100%)
 rename extensions/molecule/{ui_plugin_route/gathered => ui_plugin_routes/merged}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/ui_plugin_routes/merged/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/merged/molecule.yml (100%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/merged/vars.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/merged/verify.yml
 create mode 100644 extensions/molecule/ui_plugin_routes/overridden/cleanup.yml
 create mode 100644 extensions/molecule/ui_plugin_routes/overridden/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/overridden/molecule.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/overridden/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/overridden/vars.yml (100%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/overridden/verify.yml (86%)
 rename extensions/molecule/{ui_plugin_route/overridden => ui_plugin_routes/replaced}/cleanup.yml (83%)
 create mode 100644 extensions/molecule/ui_plugin_routes/replaced/converge.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/replaced/molecule.yml (100%)
 create mode 100644 extensions/molecule/ui_plugin_routes/replaced/prepare.yml
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/replaced/vars.yml (100%)
 rename extensions/molecule/{ui_plugin_route => ui_plugin_routes}/replaced/verify.yml (86%)
 delete mode 100644 extensions/molecule/user/check/prepare.yml
 delete mode 100644 extensions/molecule/user/deleted/prepare.yml
 delete mode 100644 extensions/molecule/user/gathered/prepare.yml
 delete mode 100644 extensions/molecule/user/replaced/cleanup.yml
 delete mode 100644 extensions/molecule/user/replaced/prepare.yml
 rename extensions/molecule/{user => users}/check/cleanup.yml (87%)
 rename extensions/molecule/{team => users}/check/converge.yml (88%)
 rename extensions/molecule/{user => users}/check/molecule.yml (100%)
 rename extensions/molecule/{route => users}/check/prepare.yml (74%)
 rename extensions/molecule/{user => users}/check/vars.yml (100%)
 rename extensions/molecule/{user => users}/check/verify.yml (85%)
 rename extensions/molecule/{user => users}/deleted/cleanup.yml (87%)
 rename extensions/molecule/{team => users}/deleted/converge.yml (75%)
 rename extensions/molecule/{user => users}/deleted/molecule.yml (100%)
 rename extensions/molecule/{route => users}/deleted/prepare.yml (74%)
 rename extensions/molecule/{user => users}/deleted/vars.yml (100%)
 rename extensions/molecule/{user => users}/deleted/verify.yml (84%)
 rename extensions/molecule/{user/merged => users/gathered}/cleanup.yml (86%)
 rename extensions/molecule/{token => users}/gathered/converge.yml (75%)
 rename extensions/molecule/{user => users}/gathered/molecule.yml (100%)
 rename extensions/molecule/{token/replaced => users/gathered}/prepare.yml (74%)
 rename extensions/molecule/{user => users}/gathered/vars.yml (100%)
 rename extensions/molecule/{user => users}/gathered/verify.yml (84%)
 rename extensions/molecule/{user => users}/inventory.yml (100%)
 rename extensions/molecule/{user/gathered => users/merged}/cleanup.yml (87%)
 rename extensions/molecule/{user => users}/merged/converge.yml (76%)
 rename extensions/molecule/{user => users}/merged/molecule.yml (100%)
 rename extensions/molecule/{user => users}/merged/vars.yml (100%)
 rename extensions/molecule/{user => users}/merged/verify.yml (85%)
 create mode 100644 extensions/molecule/users/overridden/cleanup.yml
 rename extensions/molecule/{user => users}/overridden/converge.yml (75%)
 rename extensions/molecule/{user => users}/overridden/molecule.yml (100%)
 rename extensions/molecule/{route => users}/overridden/prepare.yml (86%)
 rename extensions/molecule/{user => users}/overridden/vars.yml (100%)
 rename extensions/molecule/{user => users}/overridden/verify.yml (88%)
 rename extensions/molecule/{user/overridden => users/replaced}/cleanup.yml (86%)
 rename extensions/molecule/{token => users}/replaced/converge.yml (75%)
 rename extensions/molecule/{user => users}/replaced/molecule.yml (100%)
 rename extensions/molecule/{route/gathered => users/replaced}/prepare.yml (74%)
 rename extensions/molecule/{user => users}/replaced/vars.yml (100%)
 rename extensions/molecule/{user => users}/replaced/verify.yml (88%)
 rename plugins/action/{application.py => applications.py} (80%)
 rename plugins/action/{authenticator_user.py => authenticator_maps.py} (78%)
 rename plugins/action/{authenticator_map.py => authenticator_users.py} (77%)
 rename plugins/action/{authenticator.py => authenticators.py} (79%)
 rename plugins/action/{ca_certificate.py => ca_certificates.py} (78%)
 rename plugins/action/{feature_flag.py => feature_flags.py} (79%)
 rename plugins/action/{http_port.py => http_ports.py} (72%)
 rename plugins/action/{organization.py => organizations.py} (79%)
 rename plugins/action/{role_definition.py => role_definitions.py} (78%)
 rename plugins/action/{role_team_assignment.py => role_team_assignments.py} (76%)
 rename plugins/action/{role_user_assignment.py => role_user_assignments.py} (76%)
 rename plugins/action/{route.py => routes.py} (73%)
 rename plugins/action/{service_cluster.py => service_clusters.py} (78%)
 rename plugins/action/{service_key.py => service_keys.py} (80%)
 rename plugins/action/{service_node.py => service_nodes.py} (79%)
 rename plugins/action/{service_type.py => service_types.py} (79%)
 rename plugins/action/{service.py => services.py} (72%)
 rename plugins/action/{team.py => teams.py} (74%)
 rename plugins/action/{user.py => tokens.py} (73%)
 rename plugins/action/{ui_plugin_route.py => ui_plugin_routes.py} (78%)
 rename plugins/action/{token.py => users.py} (74%)
 rename plugins/modules/{application.py => applications.py} (96%)
 rename plugins/modules/{authenticator_map.py => authenticator_maps.py} (95%)
 rename plugins/modules/{authenticator_user.py => authenticator_users.py} (92%)
 rename plugins/modules/{authenticator.py => authenticators.py} (97%)
 rename plugins/modules/{ca_certificate.py => ca_certificates.py} (94%)
 rename plugins/modules/{feature_flag.py => feature_flags.py} (93%)
 rename plugins/modules/{http_port.py => http_ports.py} (94%)
 rename plugins/modules/{organization.py => organizations.py} (93%)
 rename plugins/modules/{role_definition.py => role_definitions.py} (93%)
 rename plugins/modules/{role_team_assignment.py => role_team_assignments.py} (93%)
 rename plugins/modules/{role_user_assignment.py => role_user_assignments.py} (93%)
 rename plugins/modules/{route.py => routes.py} (96%)
 rename plugins/modules/{service_cluster.py => service_clusters.py} (96%)
 rename plugins/modules/{service_key.py => service_keys.py} (94%)
 rename plugins/modules/{service_node.py => service_nodes.py} (94%)
 rename plugins/modules/{service_type.py => service_types.py} (94%)
 rename plugins/modules/{service.py => services.py} (96%)
 rename plugins/modules/{team.py => teams.py} (95%)
 rename plugins/modules/{token.py => tokens.py} (95%)
 rename plugins/modules/{ui_plugin_route.py => ui_plugin_routes.py} (95%)
 rename plugins/modules/{user.py => users.py} (96%)
 rename plugins/plugin_utils/ansible_models/{application.py => applications.py} (96%)
 rename plugins/plugin_utils/ansible_models/{authenticator_map.py => authenticator_maps.py} (96%)
 rename plugins/plugin_utils/ansible_models/{authenticator_user.py => authenticator_users.py} (92%)
 rename plugins/plugin_utils/ansible_models/{authenticator.py => authenticators.py} (96%)
 rename plugins/plugin_utils/ansible_models/{ca_certificate.py => ca_certificates.py} (95%)
 rename plugins/plugin_utils/ansible_models/{feature_flag.py => feature_flags.py} (95%)
 rename plugins/plugin_utils/ansible_models/{http_port.py => http_ports.py} (96%)
 rename plugins/plugin_utils/ansible_models/{organization.py => organizations.py} (95%)
 rename plugins/plugin_utils/ansible_models/{role_definition.py => role_definitions.py} (95%)
 rename plugins/plugin_utils/ansible_models/{role_team_assignment.py => role_team_assignments.py} (96%)
 rename plugins/plugin_utils/ansible_models/{role_user_assignment.py => role_user_assignments.py} (96%)
 rename plugins/plugin_utils/ansible_models/{route.py => routes.py} (97%)
 rename plugins/plugin_utils/ansible_models/{service_cluster.py => service_clusters.py} (97%)
 rename plugins/plugin_utils/ansible_models/{service_key.py => service_keys.py} (96%)
 rename plugins/plugin_utils/ansible_models/{service_node.py => service_nodes.py} (95%)
 rename plugins/plugin_utils/ansible_models/{service_type.py => service_types.py} (96%)
 rename plugins/plugin_utils/ansible_models/{service.py => services.py} (97%)
 rename plugins/plugin_utils/ansible_models/{team.py => teams.py} (96%)
 rename plugins/plugin_utils/ansible_models/{token.py => tokens.py} (96%)
 rename plugins/plugin_utils/ansible_models/{ui_plugin_route.py => ui_plugin_routes.py} (96%)
 rename plugins/plugin_utils/ansible_models/{user.py => users.py} (97%)

diff --git a/README.md b/README.md
index 3bb92632..de0168b9 100644
--- a/README.md
+++ b/README.md
@@ -1,113 +1,210 @@
-# Ansible Platform Collection
-
-## Changelog for v2.7.20260313
-
-* Added OIDC User Identity support for Ansible Automation Platform Gateway
-* New modules: feature_flag, ca_certificates, role_team_assignment, role_definition
-* Add request_timeout_seconds and idle_timeout_seconds to route modules
-* Add enable_mtls attribute to route module for mutual TLS support
-* Add associated_authenticators parameter to users module
-* Add Gateway UI plugin Route Collection Module
-* Enhanced organization association logic and auditor user support
-* Multiple bug fixes for role assignment, object deletion, and URL handling
-* Deprecated authenticator_uid and authenticators fields
+# Ansible Platform Collection (`ansible.platform`)
 
 ## Description
 
-This collection contains modules that can be used to automate the creation of resources on an install of Ansible Automation Platform.
+The `ansible.platform` collection provides idempotent resource modules for managing
+[Red Hat Ansible Automation Platform](https://www.redhat.com/en/technologies/management/ansible)
+(AAP) Gateway resources. It targets the AAP Gateway API and enables teams to define
+infrastructure-as-code for users, organizations, teams, authentication, services,
+routing, and access control — all through standard Ansible playbooks.
 
+The collection follows the **resource module** pattern: each module accepts a desired
+`config` list and a `state` (`merged`, `replaced`, `overridden`, `deleted`, or
+`gathered`), making it easy to enforce declarative configuration at scale.
 
 ## Requirements
 
-This collection supports python versions >=3.11 and requires an ansible-core version of >=2.16.0. 
-
-It also requires an existing install of Ansible Automation Platform as a target. 
+| Requirement | Version |
+|---|---|
+| Python | >= 3.11 |
+| ansible-core | >= 2.16.0 |
+| Red Hat Ansible Automation Platform | Current release |
 
+No additional Python package dependencies are required beyond what is bundled with
+`ansible-core`.
 
 ## Installation
 
-Before using this collection, you need to install it with the Ansible Galaxy command-line tool:
+Install the collection from Ansible Galaxy:
 
-```
+```bash
 ansible-galaxy collection install ansible.platform
 ```
 
-You can also include it in a requirements.yml file and install it with ansible-galaxy collection install -r requirements.yml, using the format:
+To pin a specific version:
 
-
-```yaml
-collections:
-  - name: ansible.platform.
+```bash
+ansible-galaxy collection install ansible.platform:==2.7.20260313
 ```
 
-Note that if you install any collections from Ansible Galaxy, they will not be upgraded automatically when you upgrade the Ansible package.
-To upgrade the collection to the latest available version, run the following command:
+To upgrade an already-installed collection:
 
-```
+```bash
 ansible-galaxy collection install ansible.platform --upgrade
 ```
 
-You can also install a specific version of the collection, for example, if you need to downgrade when something is broken in the latest version (please report an issue in this repository). Use the following syntax to install version 2.5.0:
+You can also declare it in a `requirements.yml` file:
 
-```
-ansible-galaxy collection install ansible.platform:==2.5.0
+```yaml
+collections:
+  - name: ansible.platform
 ```
 
-See [using Ansible collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for more details.
+Then install with:
 
-## Use Cases
-
-This collection can be used to automate to the creation of resources inside of the Ansible Automation Platform. Things such as users, organizations and teams can be created using this collection. 
+```bash
+ansible-galaxy collection install -r requirements.yml
+```
 
-Adding services (Controller, Event Driven Automation, Automation) can also be done with this collection. Nodes for those services can also be added. 
+See [Using Ansible collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html)
+for further details.
 
-## Authenticating to AAP in a playbook
+## Use Cases
 
-Connecting to AAP requires specifying authentication variables (the ones prefixed by `aap_` here) in the task. Alternatively, `AAP_` environment variables can also be set. For a complete list of authentication variables that can be used, please refer to the module specific documentations.
+The collection is intended for platform engineers and automation architects who need to
+manage AAP Gateway configuration programmatically. Common use cases include:
+
+- **Day-0 provisioning** — bootstrap a fresh AAP installation with organizations,
+  teams, users, and authenticators defined in source control.
+- **Day-2 operations** — enforce desired state across environments; detect and
+  remediate configuration drift with `state: overridden`.
+- **Audit and reporting** — use `state: gathered` to read current platform state
+  into Ansible variables for downstream processing.
+- **CI/CD pipelines** — gate deployments on AAP configuration being exactly as
+  expected before running automation.
+
+## Included Content
+
+### Modules
+
+| Module | Description |
+|---|---|
+| `ansible.platform.applications` | Manage Gateway application (OAuth2 app) resources |
+| `ansible.platform.authenticators` | Manage Gateway authenticator resources |
+| `ansible.platform.authenticator_maps` | Manage Gateway authenticator map resources |
+| `ansible.platform.authenticator_users` | Manage Gateway authenticator user resources |
+| `ansible.platform.ca_certificates` | Manage Gateway CA certificate resources |
+| `ansible.platform.feature_flags` | Manage Gateway feature flag resources |
+| `ansible.platform.http_ports` | Manage Gateway HTTP port resources |
+| `ansible.platform.organizations` | Manage Gateway organization resources |
+| `ansible.platform.role_definitions` | Manage Gateway role definition resources |
+| `ansible.platform.role_team_assignments` | Manage Gateway role-to-team assignment resources |
+| `ansible.platform.role_user_assignments` | Manage Gateway role-to-user assignment resources |
+| `ansible.platform.routes` | Manage Gateway route resources |
+| `ansible.platform.services` | Manage Gateway service resources |
+| `ansible.platform.service_clusters` | Manage Gateway service cluster resources |
+| `ansible.platform.service_keys` | Manage Gateway service key resources |
+| `ansible.platform.service_nodes` | Manage Gateway service node resources |
+| `ansible.platform.service_types` | Manage Gateway service type resources |
+| `ansible.platform.settings` | Manage Gateway settings resources |
+| `ansible.platform.teams` | Manage Gateway team resources |
+| `ansible.platform.tokens` | Manage Gateway OAuth2 token resources |
+| `ansible.platform.ui_plugin_routes` | Manage Gateway UI plugin route resources |
+| `ansible.platform.users` | Manage Gateway user resources |
+
+### Connection Plugins
+
+| Plugin | Description |
+|---|---|
+| `ansible.platform.http` | Persistent HTTP connection plugin for the AAP Gateway API |
+
+## Authenticating to AAP Gateway
+
+Each module accepts connection parameters directly in the task. You can also export
+them as environment variables (prefixed `AAP_`).
 
 ```yaml
-- name: Manage AAP
+- name: Manage AAP Gateway resources
   hosts: localhost
   tasks:
-    - name: Example for auth
-      ansible.platform.<module-name>:
-        your-module-parameters: parameter-values
-        aap_hostname: your-hostname
-        aap_username: your-username
-        aap_password: your-password
+    - name: Ensure an organization exists
+      ansible.platform.organizations:
+        config:
+          - name: "my-org"
+            description: "Managed by Ansible"
+        state: merged
+        gateway_hostname: "https://your-aap-hostname"
+        gateway_username: "admin"
+        gateway_password: "{{ vault_aap_password }}"
+        gateway_validate_certs: true
 ```
 
+### Supported connection parameters
+
+| Parameter | Environment variable | Description |
+|---|---|---|
+| `gateway_hostname` | `GATEWAY_HOSTNAME` | URL of the AAP Gateway |
+| `gateway_username` | `GATEWAY_USERNAME` | Username for authentication |
+| `gateway_password` | `GATEWAY_PASSWORD` | Password for authentication |
+| `gateway_validate_certs` | `GATEWAY_VALIDATE_CERTS` | Validate TLS certificates (default: `true`) |
+
 ## Testing
 
-This collection is tested using integration tests which can be called via `ansible-test integration`. If you wish to run the tests manually, we recommend using the parent Makefile via `make collection-test`. It will require a running version of Ansible Automation Platform.
+The collection is tested with:
+
+- **Sanity tests** — PEP8, pylint, validate-modules, yamllint, and shebang checks via
+  `ansible-test sanity`.
+- **Molecule integration tests** — per-state scenarios (`merged`, `replaced`,
+  `overridden`, `gathered`, `deleted`, and `check` mode) for every module, run against
+  a mock Gateway server.
+
+To run sanity tests locally, the collection must reside under the correct namespace
+path:
+
+```bash
+mkdir -p ~/ansible_collections/ansible/platform
+ln -s /path/to/this/repo ~/ansible_collections/ansible/platform
+
+cd ~/ansible_collections/ansible/platform
+ansible-test sanity --python 3.12
+```
+
+To run the full lint suite (matches CI):
+
+```bash
+make collection-lint
+```
 
-The collection is tested against current version of Ansible Automation Platform.
+To run Molecule integration tests:
 
+```bash
+make collection-test
+```
+
+A running Ansible Automation Platform instance is required for integration tests.
 
 ## Support
 
-This collection is supported by RedHat Engineering. Support cases can be opened at: https://access.redhat.com/support/
+This collection is supported by Red Hat Engineering. Support cases can be opened at
+<https://access.redhat.com/support/>.
+
+For bugs and feature requests, open an issue in the
+[project repository](https://github.com/ansible/ansible.platform).
 
 ## Release Notes and Roadmap
 
-Changelogs can be found in the changelogs directory. 
+Full release notes are available in [CHANGELOG.rst](https://github.com/ansible/ansible.platform/blob/main/CHANGELOG.rst).
 
+The `changelogs/` directory contains individual release fragments and the compiled
+`changelog.yaml`.
 
 ## Related Information
 
-Please refer to Ansible Automation Platform Documentation for further documentation needs: https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform/2.5
-
+- [Red Hat Ansible Automation Platform Documentation](https://docs.redhat.com/en/documentation/red_hat_ansible_automation_platform)
+- [Using Ansible Collections](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html)
+- [Ansible Resource Modules](https://docs.ansible.com/ansible/latest/network/user_guide/network_resource_modules.html)
+- [AAP Gateway API Reference](https://access.redhat.com/documentation/en-us/red_hat_ansible_automation_platform)
 
 ## License Information
 
-[GPLv3](https://github.com/ansible/ansible.platform/COPYING)
+[GPL-3.0-or-later](https://github.com/ansible/ansible.platform/blob/main/COPYING)
 
 ## Authors
 
-[Sean Sullivan](https://github.com/sean-m-sullivan)
-[Martin Slemr](https://github.com/slemrmartin)
-[Jake Jackson](https://github.com/thedboubl3j)
-[Brennan Paciorek](https://github.com/brennanpaciorek)
-[John Westcott](https://github.com/john-westcott-iv)
-[Jessica Steurer](https://github.com/jay-steurer)
-[Bryan Havenstein](https://github.com/bhavenst)
+- [Sean Sullivan](https://github.com/sean-m-sullivan)
+- [Martin Slemr](https://github.com/slemrmartin)
+- [Jake Jackson](https://github.com/thedboubl3j)
+- [Brennan Paciorek](https://github.com/brennanpaciorek)
+- [John Westcott](https://github.com/john-westcott-iv)
+- [Jessica Steurer](https://github.com/jay-steurer)
+- [Bryan Havenstein](https://github.com/bhavenst)
diff --git a/docs/01-overview.md b/docs/01-overview.md
index 784be3ed..03a6ca5b 100644
--- a/docs/01-overview.md
+++ b/docs/01-overview.md
@@ -68,7 +68,7 @@ whether the underlying API has changed between AAP versions.
 **Example:**
 ```yaml
 - name: Ensure engineering team exists in the platform
-  ansible.platform.team:
+  ansible.platform.teams:
     name: engineering
     organization: Red Hat
     state: present
diff --git a/docs/02-resource-module-pattern.md b/docs/02-resource-module-pattern.md
index 01225da3..732bc6e4 100644
--- a/docs/02-resource-module-pattern.md
+++ b/docs/02-resource-module-pattern.md
@@ -37,7 +37,7 @@ Fields you do **not** specify are left exactly as they are.
 ```yaml
 # First run — user does not exist → POST → changed: true
 - name: Create user alice
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice@example.com"
@@ -58,7 +58,7 @@ Fields you do **not** specify are left exactly as they are.
 ```yaml
 # Second run — user exists, nothing changed → changed: false
 - name: Create user alice (idempotency)
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice@example.com"
@@ -74,7 +74,7 @@ Fields you do **not** specify are left exactly as they are.
 ```yaml
 # Update one field — alice exists but email changed → PATCH → changed: true
 - name: Update alice's email
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice-new@example.com"
@@ -100,7 +100,7 @@ return `changed: true`. Running deleted twice is always idempotent.
 ```yaml
 # First run — alice exists → DELETE → changed: true
 - name: Remove user alice
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
     state: deleted
@@ -113,7 +113,7 @@ return `changed: true`. Running deleted twice is always idempotent.
 ```yaml
 # Second run — alice is already gone → changed: false
 - name: Remove user alice again (idempotency)
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
     state: deleted
@@ -136,7 +136,7 @@ updates, or deletes anything. Always returns `changed: false`.
 ```yaml
 # Gather all users
 - name: Read all users
-  ansible.platform.user:
+  ansible.platform.users:
     state: gathered
     gateway_hostname: "https://gateway.example.com"
     gateway_username: "admin"
@@ -155,7 +155,7 @@ updates, or deletes anything. Always returns `changed: false`.
 ```yaml
 # Gather a specific user (filter by config)
 - name: Check if alice exists
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
     state: gathered
@@ -178,7 +178,7 @@ resource to have exactly and only the fields you declare.
 ```yaml
 # alice currently has: first_name=Alice, last_name=Smith, is_superuser=false
 - name: Replace alice's record (unspecified fields will be nulled)
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice-replaced@example.com"
@@ -210,7 +210,7 @@ exist are created. Existing resources that differ are updated.
 # Current platform state: [admin, alice, charlie]
 # After overridden, ONLY alice and bob will exist
 - name: Enforce exact user set
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice@example.com"
@@ -253,11 +253,11 @@ Without the resource module pattern, a playbook author would need to:
 3. If creating, call the POST endpoint.
 4. If updating, call the PATCH endpoint with only changed fields.
 
-The `ansible.platform.user` module encapsulates all of this:
+The `ansible.platform.users` module encapsulates all of this:
 
 ```yaml
 - name: Ensure user alice exists          # one task
-  ansible.platform.user:
+  ansible.platform.users:
     username: alice
     email: alice@example.com
     organizations: [engineering, ops]
@@ -398,7 +398,7 @@ collection that works across all of them. The resource module pattern, combined
 the versioned data model, makes this possible. The playbook author writes:
 
 ```yaml
-ansible.platform.user:
+ansible.platform.users:
   username: alice
   state: present
 ```
@@ -413,7 +413,7 @@ baseline. `state: enforced` on a resource module is their tool:
 
 ```yaml
 - name: Enforce approved HTTP ports only
-  ansible.platform.http_port:
+  ansible.platform.http_ports:
     port: 443
     state: enforced
   loop: "{{ approved_ports }}"
diff --git a/docs/04-data-model-transformation.md b/docs/04-data-model-transformation.md
index 0f0ece0e..e6fd1bea 100644
--- a/docs/04-data-model-transformation.md
+++ b/docs/04-data-model-transformation.md
@@ -40,7 +40,7 @@ place where version-specific and resource-specific logic lives.
 
 ### Concrete Example: User Create (`state: merged`)
 
-The same data as it appears at each tier for `ansible.platform.user`:
+The same data as it appears at each tier for `ansible.platform.users`:
 
 **Tier 1 — what the playbook author writes:**
 ```yaml
diff --git a/docs/07-adding-resources.md b/docs/07-adding-resources.md
index 12b8c557..ff8a39dd 100644
--- a/docs/07-adding-resources.md
+++ b/docs/07-adding-resources.md
@@ -96,7 +96,7 @@ extends_documentation_fragment:
 
 EXAMPLES = """
 - name: Create user resources (merged)
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice@example.com"
@@ -107,18 +107,18 @@ EXAMPLES = """
     state: merged
 
 - name: Gather current user state
-  ansible.platform.user:
+  ansible.platform.users:
     state: gathered
   register: result
 
 - name: Delete specific user resources
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
     state: deleted
 
 - name: Override — ensure only these user resources exist
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "alice"
         email: "alice@example.com"
@@ -126,7 +126,7 @@ EXAMPLES = """
 """
 ```
 
-**Quality check**: Run `ansible-doc -t module ansible.platform.user`
+**Quality check**: Run `ansible-doc -t module ansible.platform.users`
 and verify all options render correctly.
 
 Expected `ansible-doc` output:
diff --git a/docs/08-testing-strategy.md b/docs/08-testing-strategy.md
index 1754077a..1527b0e5 100644
--- a/docs/08-testing-strategy.md
+++ b/docs/08-testing-strategy.md
@@ -167,7 +167,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
   tasks:
     # ── 1. Create ───────────────────────────────────────────────────────────
     - name: Create user (connection local)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
             first_name: Molecule
@@ -191,7 +191,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
 
     # ── 2. Idempotency (no change) ──────────────────────────────────────────
     - name: Run again idempotency (connection local)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
             first_name: Molecule
@@ -209,7 +209,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
 
     # ── 3. Update ───────────────────────────────────────────────────────────
     - name: Update user email and last_name (connection local)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
             last_name: UpdatedUser
@@ -225,7 +225,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
 
     # ── 4. Gathered (read-only) ─────────────────────────────────────────────
     - name: Check user exists (state gathered)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
         state: gathered
@@ -241,7 +241,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
 
     # ── 5. Delete ───────────────────────────────────────────────────────────
     - name: Delete user (connection local)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
         state: deleted
@@ -255,7 +255,7 @@ All mock scenarios follow the resource module pattern. Here is the **actual
 
     # ── 6. Delete idempotency ───────────────────────────────────────────────
     - name: Delete again (idempotency)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "{{ molecule_username }}"
         state: deleted
@@ -593,7 +593,7 @@ Each integration test target follows this sequence:
 1. **Pre-cleanup**: Delete any resources left over from previous failed runs
    ```yaml
    - name: Delete test user if exists (pre-cleanup)
-     ansible.platform.user:
+     ansible.platform.users:
        username: "test-{{ test_id }}"
        state: absent
      failed_when: false
diff --git a/extensions/molecule/application/check/cleanup.yml b/extensions/molecule/applications/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/application/check/cleanup.yml
rename to extensions/molecule/applications/check/cleanup.yml
index ca20cb7b..14741377 100644
--- a/extensions/molecule/application/check/cleanup.yml
+++ b/extensions/molecule/applications/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — application (check)"
+- name: "Cleanup — applications (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-app-alpha (test teardown)
-      ansible.platform.application:
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: deleted
diff --git a/extensions/molecule/organization/check/converge.yml b/extensions/molecule/applications/check/converge.yml
similarity index 86%
rename from extensions/molecule/organization/check/converge.yml
rename to extensions/molecule/applications/check/converge.yml
index 2c2261ed..81c9ac03 100644
--- a/extensions/molecule/organization/check/converge.yml
+++ b/extensions/molecule/applications/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (check)"
+- name: "Converge — applications (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=merged
-      ansible.platform.organization:
+    - name: Run ansible.platform.applications with state=merged
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/application/check/molecule.yml b/extensions/molecule/applications/check/molecule.yml
similarity index 100%
rename from extensions/molecule/application/check/molecule.yml
rename to extensions/molecule/applications/check/molecule.yml
diff --git a/extensions/molecule/organization/check/prepare.yml b/extensions/molecule/applications/check/prepare.yml
similarity index 73%
rename from extensions/molecule/organization/check/prepare.yml
rename to extensions/molecule/applications/check/prepare.yml
index 752d5e8d..18661b77 100644
--- a/extensions/molecule/organization/check/prepare.yml
+++ b/extensions/molecule/applications/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — organization (check)"
+- name: "Prepare — applications (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed organization as check-mode baseline (prerequisite for check)
-      ansible.platform.organization:
+    - name: Seed applications as check-mode baseline (prerequisite for check)
+      ansible.platform.applications:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/application/check/vars.yml b/extensions/molecule/applications/check/vars.yml
similarity index 100%
rename from extensions/molecule/application/check/vars.yml
rename to extensions/molecule/applications/check/vars.yml
diff --git a/extensions/molecule/application/check/verify.yml b/extensions/molecule/applications/check/verify.yml
similarity index 83%
rename from extensions/molecule/application/check/verify.yml
rename to extensions/molecule/applications/check/verify.yml
index 2e6da01a..d2d58e35 100644
--- a/extensions/molecule/application/check/verify.yml
+++ b/extensions/molecule/applications/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (check)"
+- name: "Verify — applications (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather application (check mode must not have applied changes)
-      ansible.platform.application:
+    - name: Gather applications (check mode must not have applied changes)
+      ansible.platform.applications:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/application/deleted/cleanup.yml b/extensions/molecule/applications/deleted/cleanup.yml
similarity index 85%
rename from extensions/molecule/application/deleted/cleanup.yml
rename to extensions/molecule/applications/deleted/cleanup.yml
index cb1aea52..13201812 100644
--- a/extensions/molecule/application/deleted/cleanup.yml
+++ b/extensions/molecule/applications/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — application (deleted)"
+- name: "Cleanup — applications (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/service_node/deleted/converge.yml b/extensions/molecule/applications/deleted/converge.yml
similarity index 73%
rename from extensions/molecule/service_node/deleted/converge.yml
rename to extensions/molecule/applications/deleted/converge.yml
index 8591fd68..e68a33d2 100644
--- a/extensions/molecule/service_node/deleted/converge.yml
+++ b/extensions/molecule/applications/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_node (deleted)"
+- name: "Converge — applications (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_node with state=deleted
-      ansible.platform.service_node:
+    - name: Run ansible.platform.applications with state=deleted
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/application/deleted/molecule.yml b/extensions/molecule/applications/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/application/deleted/molecule.yml
rename to extensions/molecule/applications/deleted/molecule.yml
diff --git a/extensions/molecule/organization/deleted/prepare.yml b/extensions/molecule/applications/deleted/prepare.yml
similarity index 72%
rename from extensions/molecule/organization/deleted/prepare.yml
rename to extensions/molecule/applications/deleted/prepare.yml
index b54ed135..dd58b597 100644
--- a/extensions/molecule/organization/deleted/prepare.yml
+++ b/extensions/molecule/applications/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — organization (deleted)"
+- name: "Prepare — applications (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed organization to be deleted (prerequisite for deleted)
-      ansible.platform.organization:
+    - name: Seed applications to be deleted (prerequisite for deleted)
+      ansible.platform.applications:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/application/deleted/vars.yml b/extensions/molecule/applications/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/application/deleted/vars.yml
rename to extensions/molecule/applications/deleted/vars.yml
diff --git a/extensions/molecule/application/deleted/verify.yml b/extensions/molecule/applications/deleted/verify.yml
similarity index 82%
rename from extensions/molecule/application/deleted/verify.yml
rename to extensions/molecule/applications/deleted/verify.yml
index 29f84f63..e9b0e3d9 100644
--- a/extensions/molecule/application/deleted/verify.yml
+++ b/extensions/molecule/applications/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (deleted)"
+- name: "Verify — applications (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather application (should be absent after deleted)
-      ansible.platform.application:
+    - name: Gather applications (should be absent after deleted)
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: gathered
diff --git a/extensions/molecule/application/overridden/cleanup.yml b/extensions/molecule/applications/gathered/cleanup.yml
similarity index 84%
rename from extensions/molecule/application/overridden/cleanup.yml
rename to extensions/molecule/applications/gathered/cleanup.yml
index fdb0823c..32c898e6 100644
--- a/extensions/molecule/application/overridden/cleanup.yml
+++ b/extensions/molecule/applications/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — application (overridden)"
+- name: "Cleanup — applications (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-app-alpha (test teardown)
-      ansible.platform.application:
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: deleted
diff --git a/extensions/molecule/service_node/gathered/converge.yml b/extensions/molecule/applications/gathered/converge.yml
similarity index 73%
rename from extensions/molecule/service_node/gathered/converge.yml
rename to extensions/molecule/applications/gathered/converge.yml
index 694b0feb..10b5ef07 100644
--- a/extensions/molecule/service_node/gathered/converge.yml
+++ b/extensions/molecule/applications/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_node (gathered)"
+- name: "Converge — applications (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_node with state=gathered
-      ansible.platform.service_node:
+    - name: Run ansible.platform.applications with state=gathered
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/application/gathered/molecule.yml b/extensions/molecule/applications/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/application/gathered/molecule.yml
rename to extensions/molecule/applications/gathered/molecule.yml
diff --git a/extensions/molecule/organization/gathered/prepare.yml b/extensions/molecule/applications/gathered/prepare.yml
similarity index 72%
rename from extensions/molecule/organization/gathered/prepare.yml
rename to extensions/molecule/applications/gathered/prepare.yml
index ef47e30f..4984e7e9 100644
--- a/extensions/molecule/organization/gathered/prepare.yml
+++ b/extensions/molecule/applications/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — organization (gathered)"
+- name: "Prepare — applications (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed organization to be gathered (prerequisite for gathered)
-      ansible.platform.organization:
+    - name: Seed applications to be gathered (prerequisite for gathered)
+      ansible.platform.applications:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/application/gathered/vars.yml b/extensions/molecule/applications/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/application/gathered/vars.yml
rename to extensions/molecule/applications/gathered/vars.yml
diff --git a/extensions/molecule/organization/gathered/verify.yml b/extensions/molecule/applications/gathered/verify.yml
similarity index 82%
rename from extensions/molecule/organization/gathered/verify.yml
rename to extensions/molecule/applications/gathered/verify.yml
index 39687d9d..654ca3ec 100644
--- a/extensions/molecule/organization/gathered/verify.yml
+++ b/extensions/molecule/applications/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (gathered)"
+- name: "Verify — applications (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather organization (assert present after gathered)
-      ansible.platform.organization:
+    - name: Gather applications (assert present after gathered)
+      ansible.platform.applications:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/application/inventory.yml b/extensions/molecule/applications/inventory.yml
similarity index 100%
rename from extensions/molecule/application/inventory.yml
rename to extensions/molecule/applications/inventory.yml
diff --git a/extensions/molecule/application/replaced/cleanup.yml b/extensions/molecule/applications/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/application/replaced/cleanup.yml
rename to extensions/molecule/applications/merged/cleanup.yml
index 3573b35b..c9964d5b 100644
--- a/extensions/molecule/application/replaced/cleanup.yml
+++ b/extensions/molecule/applications/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — application (replaced)"
+- name: "Cleanup — applications (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-app-alpha (test teardown)
-      ansible.platform.application:
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: deleted
diff --git a/extensions/molecule/application/merged/converge.yml b/extensions/molecule/applications/merged/converge.yml
similarity index 73%
rename from extensions/molecule/application/merged/converge.yml
rename to extensions/molecule/applications/merged/converge.yml
index 98b2f4cf..0c8b64f1 100644
--- a/extensions/molecule/application/merged/converge.yml
+++ b/extensions/molecule/applications/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (merged)"
+- name: "Converge — applications (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=merged
-      ansible.platform.application:
+    - name: Run ansible.platform.applications with state=merged
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/application/merged/molecule.yml b/extensions/molecule/applications/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/application/merged/molecule.yml
rename to extensions/molecule/applications/merged/molecule.yml
diff --git a/extensions/molecule/application/merged/vars.yml b/extensions/molecule/applications/merged/vars.yml
similarity index 100%
rename from extensions/molecule/application/merged/vars.yml
rename to extensions/molecule/applications/merged/vars.yml
diff --git a/extensions/molecule/application/merged/verify.yml b/extensions/molecule/applications/merged/verify.yml
similarity index 82%
rename from extensions/molecule/application/merged/verify.yml
rename to extensions/molecule/applications/merged/verify.yml
index 099141b7..394e4dd7 100644
--- a/extensions/molecule/application/merged/verify.yml
+++ b/extensions/molecule/applications/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (merged)"
+- name: "Verify — applications (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather application (assert present after merged)
-      ansible.platform.application:
+    - name: Gather applications (assert present after merged)
+      ansible.platform.applications:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/application/merged/cleanup.yml b/extensions/molecule/applications/overridden/cleanup.yml
similarity index 84%
rename from extensions/molecule/application/merged/cleanup.yml
rename to extensions/molecule/applications/overridden/cleanup.yml
index 2a02d6d3..9253531d 100644
--- a/extensions/molecule/application/merged/cleanup.yml
+++ b/extensions/molecule/applications/overridden/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — application (merged)"
+- name: "Cleanup — applications (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-app-alpha (test teardown)
-      ansible.platform.application:
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: deleted
diff --git a/extensions/molecule/service_node/overridden/converge.yml b/extensions/molecule/applications/overridden/converge.yml
similarity index 73%
rename from extensions/molecule/service_node/overridden/converge.yml
rename to extensions/molecule/applications/overridden/converge.yml
index 46010985..f0ba75c6 100644
--- a/extensions/molecule/service_node/overridden/converge.yml
+++ b/extensions/molecule/applications/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_node (overridden)"
+- name: "Converge — applications (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_node with state=overridden
-      ansible.platform.service_node:
+    - name: Run ansible.platform.applications with state=overridden
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/application/overridden/molecule.yml b/extensions/molecule/applications/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/application/overridden/molecule.yml
rename to extensions/molecule/applications/overridden/molecule.yml
diff --git a/extensions/molecule/application/overridden/prepare.yml b/extensions/molecule/applications/overridden/prepare.yml
similarity index 84%
rename from extensions/molecule/application/overridden/prepare.yml
rename to extensions/molecule/applications/overridden/prepare.yml
index 219ba64a..c148c5dd 100644
--- a/extensions/molecule/application/overridden/prepare.yml
+++ b/extensions/molecule/applications/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — application (overridden)"
+- name: "Prepare — applications (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.application:
+      ansible.platform.applications:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/application/overridden/vars.yml b/extensions/molecule/applications/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/application/overridden/vars.yml
rename to extensions/molecule/applications/overridden/vars.yml
diff --git a/extensions/molecule/application/overridden/verify.yml b/extensions/molecule/applications/overridden/verify.yml
similarity index 87%
rename from extensions/molecule/application/overridden/verify.yml
rename to extensions/molecule/applications/overridden/verify.yml
index 42b251d6..dbc8466b 100644
--- a/extensions/molecule/application/overridden/verify.yml
+++ b/extensions/molecule/applications/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (overridden)"
+- name: "Verify — applications (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all application resources (verify overridden final state)
-      ansible.platform.application:
+    - name: Gather all applications resources (verify overridden final state)
+      ansible.platform.applications:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/application/gathered/cleanup.yml b/extensions/molecule/applications/replaced/cleanup.yml
similarity index 84%
rename from extensions/molecule/application/gathered/cleanup.yml
rename to extensions/molecule/applications/replaced/cleanup.yml
index 7af42549..b12b8fb0 100644
--- a/extensions/molecule/application/gathered/cleanup.yml
+++ b/extensions/molecule/applications/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — application (gathered)"
+- name: "Cleanup — applications (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-app-alpha (test teardown)
-      ansible.platform.application:
+      ansible.platform.applications:
         config:
           - name: "int-app-alpha"
         state: deleted
diff --git a/extensions/molecule/organization/replaced/converge.yml b/extensions/molecule/applications/replaced/converge.yml
similarity index 73%
rename from extensions/molecule/organization/replaced/converge.yml
rename to extensions/molecule/applications/replaced/converge.yml
index 7cd3d97c..fc445fc1 100644
--- a/extensions/molecule/organization/replaced/converge.yml
+++ b/extensions/molecule/applications/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (replaced)"
+- name: "Converge — applications (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=replaced
-      ansible.platform.organization:
+    - name: Run ansible.platform.applications with state=replaced
+      ansible.platform.applications:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/application/replaced/molecule.yml b/extensions/molecule/applications/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/application/replaced/molecule.yml
rename to extensions/molecule/applications/replaced/molecule.yml
diff --git a/extensions/molecule/organization/replaced/prepare.yml b/extensions/molecule/applications/replaced/prepare.yml
similarity index 72%
rename from extensions/molecule/organization/replaced/prepare.yml
rename to extensions/molecule/applications/replaced/prepare.yml
index a7f144f0..4f66d590 100644
--- a/extensions/molecule/organization/replaced/prepare.yml
+++ b/extensions/molecule/applications/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — organization (replaced)"
+- name: "Prepare — applications (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed organization to be replaced (prerequisite for replaced)
-      ansible.platform.organization:
+    - name: Seed applications to be replaced (prerequisite for replaced)
+      ansible.platform.applications:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/application/replaced/vars.yml b/extensions/molecule/applications/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/application/replaced/vars.yml
rename to extensions/molecule/applications/replaced/vars.yml
diff --git a/extensions/molecule/application/replaced/verify.yml b/extensions/molecule/applications/replaced/verify.yml
similarity index 87%
rename from extensions/molecule/application/replaced/verify.yml
rename to extensions/molecule/applications/replaced/verify.yml
index 1bdf1696..fc556219 100644
--- a/extensions/molecule/application/replaced/verify.yml
+++ b/extensions/molecule/applications/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (replaced)"
+- name: "Verify — applications (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather application (assert present after replaced)
-      ansible.platform.application:
+    - name: Gather applications (assert present after replaced)
+      ansible.platform.applications:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator/replaced/cleanup.yml b/extensions/molecule/authenticator/replaced/cleanup.yml
deleted file mode 100644
index b9ec207e..00000000
--- a/extensions/molecule/authenticator/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — authenticator (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-auth-alpha (test teardown)
-      ansible.platform.authenticator:
-        config:
-          - name: "int-auth-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/authenticator_map/replaced/cleanup.yml b/extensions/molecule/authenticator_map/replaced/cleanup.yml
deleted file mode 100644
index 600e5dab..00000000
--- a/extensions/molecule/authenticator_map/replaced/cleanup.yml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-- name: "Cleanup — authenticator_map (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-authmap-alpha (test teardown)
-      ansible.platform.authenticator_map:
-        config:
-          - name: "int-authmap-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-    - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
-        config:
-          - name: "int-prereq-authn"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/authenticator_map/check/cleanup.yml b/extensions/molecule/authenticator_maps/check/cleanup.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/check/cleanup.yml
rename to extensions/molecule/authenticator_maps/check/cleanup.yml
index bc17596a..6cca5c96 100644
--- a/extensions/molecule/authenticator_map/check/cleanup.yml
+++ b/extensions/molecule/authenticator_maps/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator_map (check)"
+- name: "Cleanup — authenticator_maps (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-authmap-alpha (test teardown)
-      ansible.platform.authenticator_map:
+      ansible.platform.authenticator_maps:
         config:
           - name: "int-authmap-alpha"
         state: deleted
@@ -17,7 +17,7 @@
       failed_when: false
 
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/check/converge.yml b/extensions/molecule/authenticator_maps/check/converge.yml
similarity index 85%
rename from extensions/molecule/authenticator_map/check/converge.yml
rename to extensions/molecule/authenticator_maps/check/converge.yml
index 92017f08..5cf16727 100644
--- a/extensions/molecule/authenticator_map/check/converge.yml
+++ b/extensions/molecule/authenticator_maps/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (check)"
+- name: "Converge — authenticator_maps (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=merged
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=merged
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/check/molecule.yml b/extensions/molecule/authenticator_maps/check/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/check/molecule.yml
rename to extensions/molecule/authenticator_maps/check/molecule.yml
diff --git a/extensions/molecule/authenticator_map/replaced/prepare.yml b/extensions/molecule/authenticator_maps/check/prepare.yml
similarity index 79%
rename from extensions/molecule/authenticator_map/replaced/prepare.yml
rename to extensions/molecule/authenticator_maps/check/prepare.yml
index de5ea96e..adc07117 100644
--- a/extensions/molecule/authenticator_map/replaced/prepare.yml
+++ b/extensions/molecule/authenticator_maps/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (replaced)"
+- name: "Prepare — authenticator_maps (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -16,8 +16,8 @@
         gateway_password: "{{ gateway_password }}"
         gateway_validate_certs: "{{ gateway_validate_certs }}"
 
-    - name: Seed authenticator_map to be replaced (prerequisite for replaced)
-      ansible.platform.authenticator_map:
+    - name: Seed authenticator_maps as check-mode baseline (prerequisite for check)
+      ansible.platform.authenticator_maps:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator_map/check/vars.yml b/extensions/molecule/authenticator_maps/check/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/check/vars.yml
rename to extensions/molecule/authenticator_maps/check/vars.yml
diff --git a/extensions/molecule/authenticator_map/check/verify.yml b/extensions/molecule/authenticator_maps/check/verify.yml
similarity index 82%
rename from extensions/molecule/authenticator_map/check/verify.yml
rename to extensions/molecule/authenticator_maps/check/verify.yml
index 8a8a2faf..91a44256 100644
--- a/extensions/molecule/authenticator_map/check/verify.yml
+++ b/extensions/molecule/authenticator_maps/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (check)"
+- name: "Verify — authenticator_maps (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator_map (check mode must not have applied changes)
-      ansible.platform.authenticator_map:
+    - name: Gather authenticator_maps (check mode must not have applied changes)
+      ansible.platform.authenticator_maps:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator_map/deleted/cleanup.yml b/extensions/molecule/authenticator_maps/deleted/cleanup.yml
similarity index 87%
rename from extensions/molecule/authenticator_map/deleted/cleanup.yml
rename to extensions/molecule/authenticator_maps/deleted/cleanup.yml
index c4aed982..8e426de6 100644
--- a/extensions/molecule/authenticator_map/deleted/cleanup.yml
+++ b/extensions/molecule/authenticator_maps/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — authenticator_map (deleted)"
+- name: "Cleanup — authenticator_maps (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
@@ -10,7 +10,7 @@
         msg: "int-authmap-alpha was deleted in converge — nothing to clean up"
 
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/deleted/converge.yml b/extensions/molecule/authenticator_maps/deleted/converge.yml
similarity index 70%
rename from extensions/molecule/authenticator_map/deleted/converge.yml
rename to extensions/molecule/authenticator_maps/deleted/converge.yml
index 875116de..0d63ab29 100644
--- a/extensions/molecule/authenticator_map/deleted/converge.yml
+++ b/extensions/molecule/authenticator_maps/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (deleted)"
+- name: "Converge — authenticator_maps (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=deleted
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=deleted
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/authenticator/deleted/molecule.yml b/extensions/molecule/authenticator_maps/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/deleted/molecule.yml
rename to extensions/molecule/authenticator_maps/deleted/molecule.yml
diff --git a/extensions/molecule/authenticator_map/gathered/prepare.yml b/extensions/molecule/authenticator_maps/deleted/prepare.yml
similarity index 79%
rename from extensions/molecule/authenticator_map/gathered/prepare.yml
rename to extensions/molecule/authenticator_maps/deleted/prepare.yml
index 71364359..affe96a7 100644
--- a/extensions/molecule/authenticator_map/gathered/prepare.yml
+++ b/extensions/molecule/authenticator_maps/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (gathered)"
+- name: "Prepare — authenticator_maps (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -16,8 +16,8 @@
         gateway_password: "{{ gateway_password }}"
         gateway_validate_certs: "{{ gateway_validate_certs }}"
 
-    - name: Seed authenticator_map to be gathered (prerequisite for gathered)
-      ansible.platform.authenticator_map:
+    - name: Seed authenticator_maps to be deleted (prerequisite for deleted)
+      ansible.platform.authenticator_maps:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator_map/deleted/vars.yml b/extensions/molecule/authenticator_maps/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/deleted/vars.yml
rename to extensions/molecule/authenticator_maps/deleted/vars.yml
diff --git a/extensions/molecule/authenticator_map/deleted/verify.yml b/extensions/molecule/authenticator_maps/deleted/verify.yml
similarity index 80%
rename from extensions/molecule/authenticator_map/deleted/verify.yml
rename to extensions/molecule/authenticator_maps/deleted/verify.yml
index cd623159..28db5095 100644
--- a/extensions/molecule/authenticator_map/deleted/verify.yml
+++ b/extensions/molecule/authenticator_maps/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (deleted)"
+- name: "Verify — authenticator_maps (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator_map (should be absent after deleted)
-      ansible.platform.authenticator_map:
+    - name: Gather authenticator_maps (should be absent after deleted)
+      ansible.platform.authenticator_maps:
         config:
           - name: "int-authmap-alpha"
         state: gathered
diff --git a/extensions/molecule/authenticator_map/gathered/cleanup.yml b/extensions/molecule/authenticator_maps/gathered/cleanup.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/gathered/cleanup.yml
rename to extensions/molecule/authenticator_maps/gathered/cleanup.yml
index 11aff18c..1c61d301 100644
--- a/extensions/molecule/authenticator_map/gathered/cleanup.yml
+++ b/extensions/molecule/authenticator_maps/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator_map (gathered)"
+- name: "Cleanup — authenticator_maps (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-authmap-alpha (test teardown)
-      ansible.platform.authenticator_map:
+      ansible.platform.authenticator_maps:
         config:
           - name: "int-authmap-alpha"
         state: deleted
@@ -17,7 +17,7 @@
       failed_when: false
 
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/gathered/converge.yml b/extensions/molecule/authenticator_maps/gathered/converge.yml
similarity index 70%
rename from extensions/molecule/authenticator_map/gathered/converge.yml
rename to extensions/molecule/authenticator_maps/gathered/converge.yml
index 8ab533ff..6573f9f0 100644
--- a/extensions/molecule/authenticator_map/gathered/converge.yml
+++ b/extensions/molecule/authenticator_maps/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (gathered)"
+- name: "Converge — authenticator_maps (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=gathered
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=gathered
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/authenticator/gathered/molecule.yml b/extensions/molecule/authenticator_maps/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/gathered/molecule.yml
rename to extensions/molecule/authenticator_maps/gathered/molecule.yml
diff --git a/extensions/molecule/authenticator_map/check/prepare.yml b/extensions/molecule/authenticator_maps/gathered/prepare.yml
similarity index 79%
rename from extensions/molecule/authenticator_map/check/prepare.yml
rename to extensions/molecule/authenticator_maps/gathered/prepare.yml
index 6f0bb324..dc84c9b7 100644
--- a/extensions/molecule/authenticator_map/check/prepare.yml
+++ b/extensions/molecule/authenticator_maps/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (check)"
+- name: "Prepare — authenticator_maps (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -16,8 +16,8 @@
         gateway_password: "{{ gateway_password }}"
         gateway_validate_certs: "{{ gateway_validate_certs }}"
 
-    - name: Seed authenticator_map as check-mode baseline (prerequisite for check)
-      ansible.platform.authenticator_map:
+    - name: Seed authenticator_maps to be gathered (prerequisite for gathered)
+      ansible.platform.authenticator_maps:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator_map/gathered/vars.yml b/extensions/molecule/authenticator_maps/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/gathered/vars.yml
rename to extensions/molecule/authenticator_maps/gathered/vars.yml
diff --git a/extensions/molecule/authenticator_map/gathered/verify.yml b/extensions/molecule/authenticator_maps/gathered/verify.yml
similarity index 80%
rename from extensions/molecule/authenticator_map/gathered/verify.yml
rename to extensions/molecule/authenticator_maps/gathered/verify.yml
index 3411df27..909610ba 100644
--- a/extensions/molecule/authenticator_map/gathered/verify.yml
+++ b/extensions/molecule/authenticator_maps/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (gathered)"
+- name: "Verify — authenticator_maps (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator_map (assert present after gathered)
-      ansible.platform.authenticator_map:
+    - name: Gather authenticator_maps (assert present after gathered)
+      ansible.platform.authenticator_maps:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator/inventory.yml b/extensions/molecule/authenticator_maps/inventory.yml
similarity index 100%
rename from extensions/molecule/authenticator/inventory.yml
rename to extensions/molecule/authenticator_maps/inventory.yml
diff --git a/extensions/molecule/authenticator_map/merged/cleanup.yml b/extensions/molecule/authenticator_maps/merged/cleanup.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/merged/cleanup.yml
rename to extensions/molecule/authenticator_maps/merged/cleanup.yml
index e74e8089..d324caf9 100644
--- a/extensions/molecule/authenticator_map/merged/cleanup.yml
+++ b/extensions/molecule/authenticator_maps/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator_map (merged)"
+- name: "Cleanup — authenticator_maps (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-authmap-alpha (test teardown)
-      ansible.platform.authenticator_map:
+      ansible.platform.authenticator_maps:
         config:
           - name: "int-authmap-alpha"
         state: deleted
@@ -17,7 +17,7 @@
       failed_when: false
 
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/merged/converge.yml b/extensions/molecule/authenticator_maps/merged/converge.yml
similarity index 70%
rename from extensions/molecule/authenticator_map/merged/converge.yml
rename to extensions/molecule/authenticator_maps/merged/converge.yml
index 856f52e4..ae77571d 100644
--- a/extensions/molecule/authenticator_map/merged/converge.yml
+++ b/extensions/molecule/authenticator_maps/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (merged)"
+- name: "Converge — authenticator_maps (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=merged
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=merged
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/overridden/molecule.yml b/extensions/molecule/authenticator_maps/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/overridden/molecule.yml
rename to extensions/molecule/authenticator_maps/merged/molecule.yml
diff --git a/extensions/molecule/authenticator_map/merged/prepare.yml b/extensions/molecule/authenticator_maps/merged/prepare.yml
similarity index 85%
rename from extensions/molecule/authenticator_map/merged/prepare.yml
rename to extensions/molecule/authenticator_maps/merged/prepare.yml
index b905560d..d5ba38bd 100644
--- a/extensions/molecule/authenticator_map/merged/prepare.yml
+++ b/extensions/molecule/authenticator_maps/merged/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (merged)"
+- name: "Prepare — authenticator_maps (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
diff --git a/extensions/molecule/authenticator_map/merged/vars.yml b/extensions/molecule/authenticator_maps/merged/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/merged/vars.yml
rename to extensions/molecule/authenticator_maps/merged/vars.yml
diff --git a/extensions/molecule/authenticator_map/merged/verify.yml b/extensions/molecule/authenticator_maps/merged/verify.yml
similarity index 80%
rename from extensions/molecule/authenticator_map/merged/verify.yml
rename to extensions/molecule/authenticator_maps/merged/verify.yml
index 228128f4..7f7f1e9d 100644
--- a/extensions/molecule/authenticator_map/merged/verify.yml
+++ b/extensions/molecule/authenticator_maps/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (merged)"
+- name: "Verify — authenticator_maps (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator_map (assert present after merged)
-      ansible.platform.authenticator_map:
+    - name: Gather authenticator_maps (assert present after merged)
+      ansible.platform.authenticator_maps:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator_maps/overridden/cleanup.yml b/extensions/molecule/authenticator_maps/overridden/cleanup.yml
new file mode 100644
index 00000000..ab1cbbe1
--- /dev/null
+++ b/extensions/molecule/authenticator_maps/overridden/cleanup.yml
@@ -0,0 +1,30 @@
+---
+- name: "Cleanup — authenticator_maps (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-authmap-alpha (test teardown)
+      ansible.platform.authenticator_maps:
+        config:
+          - name: "int-authmap-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+    - name: Remove prerequisite authenticator (test teardown)
+      ansible.platform.authenticators:
+        config:
+          - name: "int-prereq-authn"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/authenticator_map/overridden/converge.yml b/extensions/molecule/authenticator_maps/overridden/converge.yml
similarity index 70%
rename from extensions/molecule/authenticator_map/overridden/converge.yml
rename to extensions/molecule/authenticator_maps/overridden/converge.yml
index eb2363c4..7811c5bd 100644
--- a/extensions/molecule/authenticator_map/overridden/converge.yml
+++ b/extensions/molecule/authenticator_maps/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (overridden)"
+- name: "Converge — authenticator_maps (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=overridden
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=overridden
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/authenticator/replaced/molecule.yml b/extensions/molecule/authenticator_maps/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/replaced/molecule.yml
rename to extensions/molecule/authenticator_maps/overridden/molecule.yml
diff --git a/extensions/molecule/authenticator_map/overridden/prepare.yml b/extensions/molecule/authenticator_maps/overridden/prepare.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/overridden/prepare.yml
rename to extensions/molecule/authenticator_maps/overridden/prepare.yml
index 17ba8f9d..04130d49 100644
--- a/extensions/molecule/authenticator_map/overridden/prepare.yml
+++ b/extensions/molecule/authenticator_maps/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (overridden)"
+- name: "Prepare — authenticator_maps (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -17,7 +17,7 @@
         gateway_validate_certs: "{{ gateway_validate_certs }}"
 
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.authenticator_map:
+      ansible.platform.authenticator_maps:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/authenticator_map/overridden/vars.yml b/extensions/molecule/authenticator_maps/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/overridden/vars.yml
rename to extensions/molecule/authenticator_maps/overridden/vars.yml
diff --git a/extensions/molecule/authenticator_map/overridden/verify.yml b/extensions/molecule/authenticator_maps/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/overridden/verify.yml
rename to extensions/molecule/authenticator_maps/overridden/verify.yml
index 3213217c..3555c732 100644
--- a/extensions/molecule/authenticator_map/overridden/verify.yml
+++ b/extensions/molecule/authenticator_maps/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (overridden)"
+- name: "Verify — authenticator_maps (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all authenticator_map resources (verify overridden final state)
-      ansible.platform.authenticator_map:
+    - name: Gather all authenticator_maps resources (verify overridden final state)
+      ansible.platform.authenticator_maps:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/authenticator_map/overridden/cleanup.yml b/extensions/molecule/authenticator_maps/replaced/cleanup.yml
similarity index 86%
rename from extensions/molecule/authenticator_map/overridden/cleanup.yml
rename to extensions/molecule/authenticator_maps/replaced/cleanup.yml
index 642f8854..d42f8e88 100644
--- a/extensions/molecule/authenticator_map/overridden/cleanup.yml
+++ b/extensions/molecule/authenticator_maps/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator_map (overridden)"
+- name: "Cleanup — authenticator_maps (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-authmap-alpha (test teardown)
-      ansible.platform.authenticator_map:
+      ansible.platform.authenticator_maps:
         config:
           - name: "int-authmap-alpha"
         state: deleted
@@ -17,7 +17,7 @@
       failed_when: false
 
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/replaced/converge.yml b/extensions/molecule/authenticator_maps/replaced/converge.yml
similarity index 70%
rename from extensions/molecule/authenticator_map/replaced/converge.yml
rename to extensions/molecule/authenticator_maps/replaced/converge.yml
index 59f80481..51730c04 100644
--- a/extensions/molecule/authenticator_map/replaced/converge.yml
+++ b/extensions/molecule/authenticator_maps/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator_map (replaced)"
+- name: "Converge — authenticator_maps (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator_map with state=replaced
-      ansible.platform.authenticator_map:
+    - name: Run ansible.platform.authenticator_maps with state=replaced
+      ansible.platform.authenticator_maps:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/authenticator_map/deleted/molecule.yml b/extensions/molecule/authenticator_maps/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/deleted/molecule.yml
rename to extensions/molecule/authenticator_maps/replaced/molecule.yml
diff --git a/extensions/molecule/authenticator_map/deleted/prepare.yml b/extensions/molecule/authenticator_maps/replaced/prepare.yml
similarity index 79%
rename from extensions/molecule/authenticator_map/deleted/prepare.yml
rename to extensions/molecule/authenticator_maps/replaced/prepare.yml
index fd6629e4..dec12bc6 100644
--- a/extensions/molecule/authenticator_map/deleted/prepare.yml
+++ b/extensions/molecule/authenticator_maps/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator_map (deleted)"
+- name: "Prepare — authenticator_maps (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -16,8 +16,8 @@
         gateway_password: "{{ gateway_password }}"
         gateway_validate_certs: "{{ gateway_validate_certs }}"
 
-    - name: Seed authenticator_map to be deleted (prerequisite for deleted)
-      ansible.platform.authenticator_map:
+    - name: Seed authenticator_maps to be replaced (prerequisite for replaced)
+      ansible.platform.authenticator_maps:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator_map/replaced/vars.yml b/extensions/molecule/authenticator_maps/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/replaced/vars.yml
rename to extensions/molecule/authenticator_maps/replaced/vars.yml
diff --git a/extensions/molecule/authenticator_map/replaced/verify.yml b/extensions/molecule/authenticator_maps/replaced/verify.yml
similarity index 85%
rename from extensions/molecule/authenticator_map/replaced/verify.yml
rename to extensions/molecule/authenticator_maps/replaced/verify.yml
index d6444d4c..78b59879 100644
--- a/extensions/molecule/authenticator_map/replaced/verify.yml
+++ b/extensions/molecule/authenticator_maps/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator_map (replaced)"
+- name: "Verify — authenticator_maps (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator_map (assert present after replaced)
-      ansible.platform.authenticator_map:
+    - name: Gather authenticator_maps (assert present after replaced)
+      ansible.platform.authenticator_maps:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator/check/cleanup.yml b/extensions/molecule/authenticators/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/authenticator/check/cleanup.yml
rename to extensions/molecule/authenticators/check/cleanup.yml
index dbed40b8..d1af9a10 100644
--- a/extensions/molecule/authenticator/check/cleanup.yml
+++ b/extensions/molecule/authenticators/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator (check)"
+- name: "Cleanup — authenticators (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-auth-alpha (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-auth-alpha"
         state: deleted
diff --git a/extensions/molecule/ca_certificate/check/converge.yml b/extensions/molecule/authenticators/check/converge.yml
similarity index 86%
rename from extensions/molecule/ca_certificate/check/converge.yml
rename to extensions/molecule/authenticators/check/converge.yml
index e4715c65..109d8847 100644
--- a/extensions/molecule/ca_certificate/check/converge.yml
+++ b/extensions/molecule/authenticators/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (check)"
+- name: "Converge — authenticators (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=merged
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=merged
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator_map/check/molecule.yml b/extensions/molecule/authenticators/check/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/check/molecule.yml
rename to extensions/molecule/authenticators/check/molecule.yml
diff --git a/extensions/molecule/ca_certificate/check/prepare.yml b/extensions/molecule/authenticators/check/prepare.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/check/prepare.yml
rename to extensions/molecule/authenticators/check/prepare.yml
index d5a7c38f..3ceab464 100644
--- a/extensions/molecule/ca_certificate/check/prepare.yml
+++ b/extensions/molecule/authenticators/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — ca_certificate (check)"
+- name: "Prepare — authenticators (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed ca_certificate as check-mode baseline (prerequisite for check)
-      ansible.platform.ca_certificate:
+    - name: Seed authenticators as check-mode baseline (prerequisite for check)
+      ansible.platform.authenticators:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/check/vars.yml b/extensions/molecule/authenticators/check/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/check/vars.yml
rename to extensions/molecule/authenticators/check/vars.yml
diff --git a/extensions/molecule/authenticator/check/verify.yml b/extensions/molecule/authenticators/check/verify.yml
similarity index 83%
rename from extensions/molecule/authenticator/check/verify.yml
rename to extensions/molecule/authenticators/check/verify.yml
index 8288039d..64dc4041 100644
--- a/extensions/molecule/authenticator/check/verify.yml
+++ b/extensions/molecule/authenticators/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (check)"
+- name: "Verify — authenticators (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator (check mode must not have applied changes)
-      ansible.platform.authenticator:
+    - name: Gather authenticators (check mode must not have applied changes)
+      ansible.platform.authenticators:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator/deleted/cleanup.yml b/extensions/molecule/authenticators/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/authenticator/deleted/cleanup.yml
rename to extensions/molecule/authenticators/deleted/cleanup.yml
index 30807568..8c7571c1 100644
--- a/extensions/molecule/authenticator/deleted/cleanup.yml
+++ b/extensions/molecule/authenticators/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — authenticator (deleted)"
+- name: "Cleanup — authenticators (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/ca_certificate/deleted/converge.yml b/extensions/molecule/authenticators/deleted/converge.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/deleted/converge.yml
rename to extensions/molecule/authenticators/deleted/converge.yml
index d1b4886d..191ee5fc 100644
--- a/extensions/molecule/ca_certificate/deleted/converge.yml
+++ b/extensions/molecule/authenticators/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (deleted)"
+- name: "Converge — authenticators (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=deleted
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=deleted
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/authenticator_map/gathered/molecule.yml b/extensions/molecule/authenticators/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/gathered/molecule.yml
rename to extensions/molecule/authenticators/deleted/molecule.yml
diff --git a/extensions/molecule/ca_certificate/deleted/prepare.yml b/extensions/molecule/authenticators/deleted/prepare.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/deleted/prepare.yml
rename to extensions/molecule/authenticators/deleted/prepare.yml
index e96301eb..8608db62 100644
--- a/extensions/molecule/ca_certificate/deleted/prepare.yml
+++ b/extensions/molecule/authenticators/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — ca_certificate (deleted)"
+- name: "Prepare — authenticators (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed ca_certificate to be deleted (prerequisite for deleted)
-      ansible.platform.ca_certificate:
+    - name: Seed authenticators to be deleted (prerequisite for deleted)
+      ansible.platform.authenticators:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/deleted/vars.yml b/extensions/molecule/authenticators/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/deleted/vars.yml
rename to extensions/molecule/authenticators/deleted/vars.yml
diff --git a/extensions/molecule/authenticator/deleted/verify.yml b/extensions/molecule/authenticators/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/authenticator/deleted/verify.yml
rename to extensions/molecule/authenticators/deleted/verify.yml
index 129f9c77..1ffe1713 100644
--- a/extensions/molecule/authenticator/deleted/verify.yml
+++ b/extensions/molecule/authenticators/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (deleted)"
+- name: "Verify — authenticators (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator (should be absent after deleted)
-      ansible.platform.authenticator:
+    - name: Gather authenticators (should be absent after deleted)
+      ansible.platform.authenticators:
         config:
           - name: "int-auth-alpha"
         state: gathered
diff --git a/extensions/molecule/authenticator/merged/cleanup.yml b/extensions/molecule/authenticators/gathered/cleanup.yml
similarity index 83%
rename from extensions/molecule/authenticator/merged/cleanup.yml
rename to extensions/molecule/authenticators/gathered/cleanup.yml
index de1cb5f5..73431edd 100644
--- a/extensions/molecule/authenticator/merged/cleanup.yml
+++ b/extensions/molecule/authenticators/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator (merged)"
+- name: "Cleanup — authenticators (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-auth-alpha (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-auth-alpha"
         state: deleted
diff --git a/extensions/molecule/ca_certificate/gathered/converge.yml b/extensions/molecule/authenticators/gathered/converge.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/gathered/converge.yml
rename to extensions/molecule/authenticators/gathered/converge.yml
index d1d27c18..fdaeef7c 100644
--- a/extensions/molecule/ca_certificate/gathered/converge.yml
+++ b/extensions/molecule/authenticators/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (gathered)"
+- name: "Converge — authenticators (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=gathered
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=gathered
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/authenticator_map/merged/molecule.yml b/extensions/molecule/authenticators/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/merged/molecule.yml
rename to extensions/molecule/authenticators/gathered/molecule.yml
diff --git a/extensions/molecule/ca_certificate/gathered/prepare.yml b/extensions/molecule/authenticators/gathered/prepare.yml
similarity index 71%
rename from extensions/molecule/ca_certificate/gathered/prepare.yml
rename to extensions/molecule/authenticators/gathered/prepare.yml
index 8022cf90..7f9f19df 100644
--- a/extensions/molecule/ca_certificate/gathered/prepare.yml
+++ b/extensions/molecule/authenticators/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — ca_certificate (gathered)"
+- name: "Prepare — authenticators (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed ca_certificate to be gathered (prerequisite for gathered)
-      ansible.platform.ca_certificate:
+    - name: Seed authenticators to be gathered (prerequisite for gathered)
+      ansible.platform.authenticators:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/gathered/vars.yml b/extensions/molecule/authenticators/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/gathered/vars.yml
rename to extensions/molecule/authenticators/gathered/vars.yml
diff --git a/extensions/molecule/ca_certificate/gathered/verify.yml b/extensions/molecule/authenticators/gathered/verify.yml
similarity index 82%
rename from extensions/molecule/ca_certificate/gathered/verify.yml
rename to extensions/molecule/authenticators/gathered/verify.yml
index 8468d3a3..deb52b44 100644
--- a/extensions/molecule/ca_certificate/gathered/verify.yml
+++ b/extensions/molecule/authenticators/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (gathered)"
+- name: "Verify — authenticators (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ca_certificate (assert present after gathered)
-      ansible.platform.ca_certificate:
+    - name: Gather authenticators (assert present after gathered)
+      ansible.platform.authenticators:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticator_map/inventory.yml b/extensions/molecule/authenticators/inventory.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/inventory.yml
rename to extensions/molecule/authenticators/inventory.yml
diff --git a/extensions/molecule/authenticator/gathered/cleanup.yml b/extensions/molecule/authenticators/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/authenticator/gathered/cleanup.yml
rename to extensions/molecule/authenticators/merged/cleanup.yml
index d6d449cd..5bf1d988 100644
--- a/extensions/molecule/authenticator/gathered/cleanup.yml
+++ b/extensions/molecule/authenticators/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator (gathered)"
+- name: "Cleanup — authenticators (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-auth-alpha (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-auth-alpha"
         state: deleted
diff --git a/extensions/molecule/ca_certificate/merged/converge.yml b/extensions/molecule/authenticators/merged/converge.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/merged/converge.yml
rename to extensions/molecule/authenticators/merged/converge.yml
index 66a2ec40..d3090eca 100644
--- a/extensions/molecule/ca_certificate/merged/converge.yml
+++ b/extensions/molecule/authenticators/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (merged)"
+- name: "Converge — authenticators (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=merged
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=merged
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/merged/molecule.yml b/extensions/molecule/authenticators/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator/merged/molecule.yml
rename to extensions/molecule/authenticators/merged/molecule.yml
diff --git a/extensions/molecule/authenticator/merged/vars.yml b/extensions/molecule/authenticators/merged/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/merged/vars.yml
rename to extensions/molecule/authenticators/merged/vars.yml
diff --git a/extensions/molecule/ca_certificate/merged/verify.yml b/extensions/molecule/authenticators/merged/verify.yml
similarity index 82%
rename from extensions/molecule/ca_certificate/merged/verify.yml
rename to extensions/molecule/authenticators/merged/verify.yml
index 026e4277..dac97254 100644
--- a/extensions/molecule/ca_certificate/merged/verify.yml
+++ b/extensions/molecule/authenticators/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (merged)"
+- name: "Verify — authenticators (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ca_certificate (assert present after merged)
-      ansible.platform.ca_certificate:
+    - name: Gather authenticators (assert present after merged)
+      ansible.platform.authenticators:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/authenticators/overridden/cleanup.yml b/extensions/molecule/authenticators/overridden/cleanup.yml
new file mode 100644
index 00000000..6a6924e6
--- /dev/null
+++ b/extensions/molecule/authenticators/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — authenticators (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-auth-alpha (test teardown)
+      ansible.platform.authenticators:
+        config:
+          - name: "int-auth-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/ca_certificate/overridden/converge.yml b/extensions/molecule/authenticators/overridden/converge.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/overridden/converge.yml
rename to extensions/molecule/authenticators/overridden/converge.yml
index 3a439d64..e7ac2f19 100644
--- a/extensions/molecule/ca_certificate/overridden/converge.yml
+++ b/extensions/molecule/authenticators/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (overridden)"
+- name: "Converge — authenticators (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=overridden
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=overridden
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/authenticator_map/overridden/molecule.yml b/extensions/molecule/authenticators/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/overridden/molecule.yml
rename to extensions/molecule/authenticators/overridden/molecule.yml
diff --git a/extensions/molecule/ca_certificate/overridden/prepare.yml b/extensions/molecule/authenticators/overridden/prepare.yml
similarity index 83%
rename from extensions/molecule/ca_certificate/overridden/prepare.yml
rename to extensions/molecule/authenticators/overridden/prepare.yml
index 6d1a303b..cbb636c5 100644
--- a/extensions/molecule/ca_certificate/overridden/prepare.yml
+++ b/extensions/molecule/authenticators/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — ca_certificate (overridden)"
+- name: "Prepare — authenticators (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.ca_certificate:
+      ansible.platform.authenticators:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/authenticator/overridden/vars.yml b/extensions/molecule/authenticators/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/overridden/vars.yml
rename to extensions/molecule/authenticators/overridden/vars.yml
diff --git a/extensions/molecule/authenticator/overridden/verify.yml b/extensions/molecule/authenticators/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/authenticator/overridden/verify.yml
rename to extensions/molecule/authenticators/overridden/verify.yml
index 34e561a6..967ff705 100644
--- a/extensions/molecule/authenticator/overridden/verify.yml
+++ b/extensions/molecule/authenticators/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (overridden)"
+- name: "Verify — authenticators (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all authenticator resources (verify overridden final state)
-      ansible.platform.authenticator:
+    - name: Gather all authenticators resources (verify overridden final state)
+      ansible.platform.authenticators:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/authenticator/overridden/cleanup.yml b/extensions/molecule/authenticators/replaced/cleanup.yml
similarity index 83%
rename from extensions/molecule/authenticator/overridden/cleanup.yml
rename to extensions/molecule/authenticators/replaced/cleanup.yml
index 855e04e1..41a94b46 100644
--- a/extensions/molecule/authenticator/overridden/cleanup.yml
+++ b/extensions/molecule/authenticators/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — authenticator (overridden)"
+- name: "Cleanup — authenticators (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-auth-alpha (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-auth-alpha"
         state: deleted
diff --git a/extensions/molecule/ca_certificate/replaced/converge.yml b/extensions/molecule/authenticators/replaced/converge.yml
similarity index 72%
rename from extensions/molecule/ca_certificate/replaced/converge.yml
rename to extensions/molecule/authenticators/replaced/converge.yml
index 45d8b099..c325eb3a 100644
--- a/extensions/molecule/ca_certificate/replaced/converge.yml
+++ b/extensions/molecule/authenticators/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — ca_certificate (replaced)"
+- name: "Converge — authenticators (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.ca_certificate with state=replaced
-      ansible.platform.ca_certificate:
+    - name: Run ansible.platform.authenticators with state=replaced
+      ansible.platform.authenticators:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/authenticator_map/replaced/molecule.yml b/extensions/molecule/authenticators/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/authenticator_map/replaced/molecule.yml
rename to extensions/molecule/authenticators/replaced/molecule.yml
diff --git a/extensions/molecule/ca_certificate/replaced/prepare.yml b/extensions/molecule/authenticators/replaced/prepare.yml
similarity index 71%
rename from extensions/molecule/ca_certificate/replaced/prepare.yml
rename to extensions/molecule/authenticators/replaced/prepare.yml
index 34a7d3d7..842ee4f1 100644
--- a/extensions/molecule/ca_certificate/replaced/prepare.yml
+++ b/extensions/molecule/authenticators/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — ca_certificate (replaced)"
+- name: "Prepare — authenticators (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed ca_certificate to be replaced (prerequisite for replaced)
-      ansible.platform.ca_certificate:
+    - name: Seed authenticators to be replaced (prerequisite for replaced)
+      ansible.platform.authenticators:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/authenticator/replaced/vars.yml b/extensions/molecule/authenticators/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/authenticator/replaced/vars.yml
rename to extensions/molecule/authenticators/replaced/vars.yml
diff --git a/extensions/molecule/authenticator/replaced/verify.yml b/extensions/molecule/authenticators/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/authenticator/replaced/verify.yml
rename to extensions/molecule/authenticators/replaced/verify.yml
index 8f4c0dce..1876e053 100644
--- a/extensions/molecule/authenticator/replaced/verify.yml
+++ b/extensions/molecule/authenticators/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (replaced)"
+- name: "Verify — authenticators (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator (assert present after replaced)
-      ansible.platform.authenticator:
+    - name: Gather authenticators (assert present after replaced)
+      ansible.platform.authenticators:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/ca_certificate/replaced/cleanup.yml b/extensions/molecule/ca_certificate/replaced/cleanup.yml
deleted file mode 100644
index 711c2ac0..00000000
--- a/extensions/molecule/ca_certificate/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — ca_certificate (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-cert-alpha (test teardown)
-      ansible.platform.ca_certificate:
-        config:
-          - name: "int-cert-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/ca_certificate/check/cleanup.yml b/extensions/molecule/ca_certificates/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/ca_certificate/check/cleanup.yml
rename to extensions/molecule/ca_certificates/check/cleanup.yml
index eef25482..5d263097 100644
--- a/extensions/molecule/ca_certificate/check/cleanup.yml
+++ b/extensions/molecule/ca_certificates/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ca_certificate (check)"
+- name: "Cleanup — ca_certificates (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cert-alpha (test teardown)
-      ansible.platform.ca_certificate:
+      ansible.platform.ca_certificates:
         config:
           - name: "int-cert-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definition/check/converge.yml b/extensions/molecule/ca_certificates/check/converge.yml
similarity index 86%
rename from extensions/molecule/role_definition/check/converge.yml
rename to extensions/molecule/ca_certificates/check/converge.yml
index c141d7e6..64dd3629 100644
--- a/extensions/molecule/role_definition/check/converge.yml
+++ b/extensions/molecule/ca_certificates/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (check)"
+- name: "Converge — ca_certificates (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=merged
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=merged
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/check/molecule.yml b/extensions/molecule/ca_certificates/check/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/check/molecule.yml
rename to extensions/molecule/ca_certificates/check/molecule.yml
diff --git a/extensions/molecule/role_definition/check/prepare.yml b/extensions/molecule/ca_certificates/check/prepare.yml
similarity index 72%
rename from extensions/molecule/role_definition/check/prepare.yml
rename to extensions/molecule/ca_certificates/check/prepare.yml
index bbaf64cd..5d0eda05 100644
--- a/extensions/molecule/role_definition/check/prepare.yml
+++ b/extensions/molecule/ca_certificates/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — role_definition (check)"
+- name: "Prepare — ca_certificates (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed role_definition as check-mode baseline (prerequisite for check)
-      ansible.platform.role_definition:
+    - name: Seed ca_certificates as check-mode baseline (prerequisite for check)
+      ansible.platform.ca_certificates:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/check/vars.yml b/extensions/molecule/ca_certificates/check/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/check/vars.yml
rename to extensions/molecule/ca_certificates/check/vars.yml
diff --git a/extensions/molecule/ca_certificate/check/verify.yml b/extensions/molecule/ca_certificates/check/verify.yml
similarity index 83%
rename from extensions/molecule/ca_certificate/check/verify.yml
rename to extensions/molecule/ca_certificates/check/verify.yml
index 4c52c352..98fdee0d 100644
--- a/extensions/molecule/ca_certificate/check/verify.yml
+++ b/extensions/molecule/ca_certificates/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (check)"
+- name: "Verify — ca_certificates (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ca_certificate (check mode must not have applied changes)
-      ansible.platform.ca_certificate:
+    - name: Gather ca_certificates (check mode must not have applied changes)
+      ansible.platform.ca_certificates:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/ca_certificate/deleted/cleanup.yml b/extensions/molecule/ca_certificates/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/ca_certificate/deleted/cleanup.yml
rename to extensions/molecule/ca_certificates/deleted/cleanup.yml
index b8562204..c29a6b94 100644
--- a/extensions/molecule/ca_certificate/deleted/cleanup.yml
+++ b/extensions/molecule/ca_certificates/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — ca_certificate (deleted)"
+- name: "Cleanup — ca_certificates (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/role_definition/deleted/converge.yml b/extensions/molecule/ca_certificates/deleted/converge.yml
similarity index 72%
rename from extensions/molecule/role_definition/deleted/converge.yml
rename to extensions/molecule/ca_certificates/deleted/converge.yml
index f76667f7..2750e147 100644
--- a/extensions/molecule/role_definition/deleted/converge.yml
+++ b/extensions/molecule/ca_certificates/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (deleted)"
+- name: "Converge — ca_certificates (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=deleted
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=deleted
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/ca_certificate/deleted/molecule.yml b/extensions/molecule/ca_certificates/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/deleted/molecule.yml
rename to extensions/molecule/ca_certificates/deleted/molecule.yml
diff --git a/extensions/molecule/role_definition/deleted/prepare.yml b/extensions/molecule/ca_certificates/deleted/prepare.yml
similarity index 71%
rename from extensions/molecule/role_definition/deleted/prepare.yml
rename to extensions/molecule/ca_certificates/deleted/prepare.yml
index ff536839..4b84880c 100644
--- a/extensions/molecule/role_definition/deleted/prepare.yml
+++ b/extensions/molecule/ca_certificates/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — role_definition (deleted)"
+- name: "Prepare — ca_certificates (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed role_definition to be deleted (prerequisite for deleted)
-      ansible.platform.role_definition:
+    - name: Seed ca_certificates to be deleted (prerequisite for deleted)
+      ansible.platform.ca_certificates:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/deleted/vars.yml b/extensions/molecule/ca_certificates/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/deleted/vars.yml
rename to extensions/molecule/ca_certificates/deleted/vars.yml
diff --git a/extensions/molecule/ca_certificate/deleted/verify.yml b/extensions/molecule/ca_certificates/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/ca_certificate/deleted/verify.yml
rename to extensions/molecule/ca_certificates/deleted/verify.yml
index 60923050..3c60949d 100644
--- a/extensions/molecule/ca_certificate/deleted/verify.yml
+++ b/extensions/molecule/ca_certificates/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (deleted)"
+- name: "Verify — ca_certificates (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ca_certificate (should be absent after deleted)
-      ansible.platform.ca_certificate:
+    - name: Gather ca_certificates (should be absent after deleted)
+      ansible.platform.ca_certificates:
         config:
           - name: "int-cert-alpha"
         state: gathered
diff --git a/extensions/molecule/ca_certificate/merged/cleanup.yml b/extensions/molecule/ca_certificates/gathered/cleanup.yml
similarity index 83%
rename from extensions/molecule/ca_certificate/merged/cleanup.yml
rename to extensions/molecule/ca_certificates/gathered/cleanup.yml
index 35ca802c..ceeaf7a1 100644
--- a/extensions/molecule/ca_certificate/merged/cleanup.yml
+++ b/extensions/molecule/ca_certificates/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ca_certificate (merged)"
+- name: "Cleanup — ca_certificates (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cert-alpha (test teardown)
-      ansible.platform.ca_certificate:
+      ansible.platform.ca_certificates:
         config:
           - name: "int-cert-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definition/gathered/converge.yml b/extensions/molecule/ca_certificates/gathered/converge.yml
similarity index 72%
rename from extensions/molecule/role_definition/gathered/converge.yml
rename to extensions/molecule/ca_certificates/gathered/converge.yml
index 2504df5d..e07e1739 100644
--- a/extensions/molecule/role_definition/gathered/converge.yml
+++ b/extensions/molecule/ca_certificates/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (gathered)"
+- name: "Converge — ca_certificates (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=gathered
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=gathered
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/ca_certificate/gathered/molecule.yml b/extensions/molecule/ca_certificates/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/gathered/molecule.yml
rename to extensions/molecule/ca_certificates/gathered/molecule.yml
diff --git a/extensions/molecule/role_definition/gathered/prepare.yml b/extensions/molecule/ca_certificates/gathered/prepare.yml
similarity index 71%
rename from extensions/molecule/role_definition/gathered/prepare.yml
rename to extensions/molecule/ca_certificates/gathered/prepare.yml
index 23199f41..b815d2eb 100644
--- a/extensions/molecule/role_definition/gathered/prepare.yml
+++ b/extensions/molecule/ca_certificates/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — role_definition (gathered)"
+- name: "Prepare — ca_certificates (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed role_definition to be gathered (prerequisite for gathered)
-      ansible.platform.role_definition:
+    - name: Seed ca_certificates to be gathered (prerequisite for gathered)
+      ansible.platform.ca_certificates:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/gathered/vars.yml b/extensions/molecule/ca_certificates/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/gathered/vars.yml
rename to extensions/molecule/ca_certificates/gathered/vars.yml
diff --git a/extensions/molecule/role_definition/gathered/verify.yml b/extensions/molecule/ca_certificates/gathered/verify.yml
similarity index 81%
rename from extensions/molecule/role_definition/gathered/verify.yml
rename to extensions/molecule/ca_certificates/gathered/verify.yml
index a6daf193..7bc98ee9 100644
--- a/extensions/molecule/role_definition/gathered/verify.yml
+++ b/extensions/molecule/ca_certificates/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (gathered)"
+- name: "Verify — ca_certificates (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather role_definition (assert present after gathered)
-      ansible.platform.role_definition:
+    - name: Gather ca_certificates (assert present after gathered)
+      ansible.platform.ca_certificates:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/ca_certificate/inventory.yml b/extensions/molecule/ca_certificates/inventory.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/inventory.yml
rename to extensions/molecule/ca_certificates/inventory.yml
diff --git a/extensions/molecule/ca_certificate/gathered/cleanup.yml b/extensions/molecule/ca_certificates/merged/cleanup.yml
similarity index 83%
rename from extensions/molecule/ca_certificate/gathered/cleanup.yml
rename to extensions/molecule/ca_certificates/merged/cleanup.yml
index a3f48f4a..9094aca9 100644
--- a/extensions/molecule/ca_certificate/gathered/cleanup.yml
+++ b/extensions/molecule/ca_certificates/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ca_certificate (gathered)"
+- name: "Cleanup — ca_certificates (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cert-alpha (test teardown)
-      ansible.platform.ca_certificate:
+      ansible.platform.ca_certificates:
         config:
           - name: "int-cert-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definition/merged/converge.yml b/extensions/molecule/ca_certificates/merged/converge.yml
similarity index 72%
rename from extensions/molecule/role_definition/merged/converge.yml
rename to extensions/molecule/ca_certificates/merged/converge.yml
index 504f7509..50bc1a95 100644
--- a/extensions/molecule/role_definition/merged/converge.yml
+++ b/extensions/molecule/ca_certificates/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (merged)"
+- name: "Converge — ca_certificates (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=merged
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=merged
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/merged/molecule.yml b/extensions/molecule/ca_certificates/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/merged/molecule.yml
rename to extensions/molecule/ca_certificates/merged/molecule.yml
diff --git a/extensions/molecule/ca_certificate/merged/vars.yml b/extensions/molecule/ca_certificates/merged/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/merged/vars.yml
rename to extensions/molecule/ca_certificates/merged/vars.yml
diff --git a/extensions/molecule/role_definition/merged/verify.yml b/extensions/molecule/ca_certificates/merged/verify.yml
similarity index 81%
rename from extensions/molecule/role_definition/merged/verify.yml
rename to extensions/molecule/ca_certificates/merged/verify.yml
index 921a1de5..8d718833 100644
--- a/extensions/molecule/role_definition/merged/verify.yml
+++ b/extensions/molecule/ca_certificates/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (merged)"
+- name: "Verify — ca_certificates (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather role_definition (assert present after merged)
-      ansible.platform.role_definition:
+    - name: Gather ca_certificates (assert present after merged)
+      ansible.platform.ca_certificates:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/ca_certificates/overridden/cleanup.yml b/extensions/molecule/ca_certificates/overridden/cleanup.yml
new file mode 100644
index 00000000..30d21591
--- /dev/null
+++ b/extensions/molecule/ca_certificates/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — ca_certificates (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-cert-alpha (test teardown)
+      ansible.platform.ca_certificates:
+        config:
+          - name: "int-cert-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/role_definition/overridden/converge.yml b/extensions/molecule/ca_certificates/overridden/converge.yml
similarity index 72%
rename from extensions/molecule/role_definition/overridden/converge.yml
rename to extensions/molecule/ca_certificates/overridden/converge.yml
index 9f7018c4..1b777a6f 100644
--- a/extensions/molecule/role_definition/overridden/converge.yml
+++ b/extensions/molecule/ca_certificates/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (overridden)"
+- name: "Converge — ca_certificates (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=overridden
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=overridden
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/ca_certificate/overridden/molecule.yml b/extensions/molecule/ca_certificates/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/overridden/molecule.yml
rename to extensions/molecule/ca_certificates/overridden/molecule.yml
diff --git a/extensions/molecule/ca_certificates/overridden/prepare.yml b/extensions/molecule/ca_certificates/overridden/prepare.yml
new file mode 100644
index 00000000..766303c7
--- /dev/null
+++ b/extensions/molecule/ca_certificates/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — ca_certificates (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.ca_certificates:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ca_certificate/overridden/vars.yml b/extensions/molecule/ca_certificates/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/overridden/vars.yml
rename to extensions/molecule/ca_certificates/overridden/vars.yml
diff --git a/extensions/molecule/ca_certificate/overridden/verify.yml b/extensions/molecule/ca_certificates/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/ca_certificate/overridden/verify.yml
rename to extensions/molecule/ca_certificates/overridden/verify.yml
index f844fa86..62cad631 100644
--- a/extensions/molecule/ca_certificate/overridden/verify.yml
+++ b/extensions/molecule/ca_certificates/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (overridden)"
+- name: "Verify — ca_certificates (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all ca_certificate resources (verify overridden final state)
-      ansible.platform.ca_certificate:
+    - name: Gather all ca_certificates resources (verify overridden final state)
+      ansible.platform.ca_certificates:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/ca_certificate/overridden/cleanup.yml b/extensions/molecule/ca_certificates/replaced/cleanup.yml
similarity index 83%
rename from extensions/molecule/ca_certificate/overridden/cleanup.yml
rename to extensions/molecule/ca_certificates/replaced/cleanup.yml
index 5b8cc808..c06f4346 100644
--- a/extensions/molecule/ca_certificate/overridden/cleanup.yml
+++ b/extensions/molecule/ca_certificates/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ca_certificate (overridden)"
+- name: "Cleanup — ca_certificates (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cert-alpha (test teardown)
-      ansible.platform.ca_certificate:
+      ansible.platform.ca_certificates:
         config:
           - name: "int-cert-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definition/replaced/converge.yml b/extensions/molecule/ca_certificates/replaced/converge.yml
similarity index 72%
rename from extensions/molecule/role_definition/replaced/converge.yml
rename to extensions/molecule/ca_certificates/replaced/converge.yml
index d9c21ff5..3ad2ba7f 100644
--- a/extensions/molecule/role_definition/replaced/converge.yml
+++ b/extensions/molecule/ca_certificates/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — role_definition (replaced)"
+- name: "Converge — ca_certificates (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.role_definition with state=replaced
-      ansible.platform.role_definition:
+    - name: Run ansible.platform.ca_certificates with state=replaced
+      ansible.platform.ca_certificates:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/ca_certificate/replaced/molecule.yml b/extensions/molecule/ca_certificates/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/replaced/molecule.yml
rename to extensions/molecule/ca_certificates/replaced/molecule.yml
diff --git a/extensions/molecule/role_definition/replaced/prepare.yml b/extensions/molecule/ca_certificates/replaced/prepare.yml
similarity index 71%
rename from extensions/molecule/role_definition/replaced/prepare.yml
rename to extensions/molecule/ca_certificates/replaced/prepare.yml
index d239a86e..6d07a8b7 100644
--- a/extensions/molecule/role_definition/replaced/prepare.yml
+++ b/extensions/molecule/ca_certificates/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — role_definition (replaced)"
+- name: "Prepare — ca_certificates (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed role_definition to be replaced (prerequisite for replaced)
-      ansible.platform.role_definition:
+    - name: Seed ca_certificates to be replaced (prerequisite for replaced)
+      ansible.platform.ca_certificates:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/ca_certificate/replaced/vars.yml b/extensions/molecule/ca_certificates/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/ca_certificate/replaced/vars.yml
rename to extensions/molecule/ca_certificates/replaced/vars.yml
diff --git a/extensions/molecule/ca_certificate/replaced/verify.yml b/extensions/molecule/ca_certificates/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/ca_certificate/replaced/verify.yml
rename to extensions/molecule/ca_certificates/replaced/verify.yml
index 6c2462a3..a7c4dcee 100644
--- a/extensions/molecule/ca_certificate/replaced/verify.yml
+++ b/extensions/molecule/ca_certificates/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ca_certificate (replaced)"
+- name: "Verify — ca_certificates (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ca_certificate (assert present after replaced)
-      ansible.platform.ca_certificate:
+    - name: Gather ca_certificates (assert present after replaced)
+      ansible.platform.ca_certificates:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/http_port/replaced/cleanup.yml b/extensions/molecule/http_port/replaced/cleanup.yml
deleted file mode 100644
index 5cf8b43f..00000000
--- a/extensions/molecule/http_port/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — http_port (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-port-alpha (test teardown)
-      ansible.platform.http_port:
-        config:
-          - name: "int-port-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/http_port/replaced/prepare.yml b/extensions/molecule/http_port/replaced/prepare.yml
deleted file mode 100644
index bdce5b1b..00000000
--- a/extensions/molecule/http_port/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — http_port (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed http_port to be replaced (prerequisite for replaced)
-      ansible.platform.http_port:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/http_port/check/cleanup.yml b/extensions/molecule/http_ports/check/cleanup.yml
similarity index 85%
rename from extensions/molecule/http_port/check/cleanup.yml
rename to extensions/molecule/http_ports/check/cleanup.yml
index 6830e862..1626d092 100644
--- a/extensions/molecule/http_port/check/cleanup.yml
+++ b/extensions/molecule/http_ports/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — http_port (check)"
+- name: "Cleanup — http_ports (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-port-alpha (test teardown)
-      ansible.platform.http_port:
+      ansible.platform.http_ports:
         config:
           - name: "int-port-alpha"
         state: deleted
diff --git a/extensions/molecule/http_port/check/converge.yml b/extensions/molecule/http_ports/check/converge.yml
similarity index 87%
rename from extensions/molecule/http_port/check/converge.yml
rename to extensions/molecule/http_ports/check/converge.yml
index f2af6b03..86bd2c0f 100644
--- a/extensions/molecule/http_port/check/converge.yml
+++ b/extensions/molecule/http_ports/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (check)"
+- name: "Converge — http_ports (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=merged
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=merged
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/http_port/check/molecule.yml b/extensions/molecule/http_ports/check/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/check/molecule.yml
rename to extensions/molecule/http_ports/check/molecule.yml
diff --git a/extensions/molecule/http_ports/check/prepare.yml b/extensions/molecule/http_ports/check/prepare.yml
new file mode 100644
index 00000000..e18cf134
--- /dev/null
+++ b/extensions/molecule/http_ports/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — http_ports (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed http_ports as check-mode baseline (prerequisite for check)
+      ansible.platform.http_ports:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/http_port/check/vars.yml b/extensions/molecule/http_ports/check/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/check/vars.yml
rename to extensions/molecule/http_ports/check/vars.yml
diff --git a/extensions/molecule/http_port/check/verify.yml b/extensions/molecule/http_ports/check/verify.yml
similarity index 84%
rename from extensions/molecule/http_port/check/verify.yml
rename to extensions/molecule/http_ports/check/verify.yml
index 31d2a55c..dc06a45e 100644
--- a/extensions/molecule/http_port/check/verify.yml
+++ b/extensions/molecule/http_ports/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (check)"
+- name: "Verify — http_ports (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather http_port (check mode must not have applied changes)
-      ansible.platform.http_port:
+    - name: Gather http_ports (check mode must not have applied changes)
+      ansible.platform.http_ports:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/http_port/deleted/cleanup.yml b/extensions/molecule/http_ports/deleted/cleanup.yml
similarity index 85%
rename from extensions/molecule/http_port/deleted/cleanup.yml
rename to extensions/molecule/http_ports/deleted/cleanup.yml
index a672564e..0f420f26 100644
--- a/extensions/molecule/http_port/deleted/cleanup.yml
+++ b/extensions/molecule/http_ports/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — http_port (deleted)"
+- name: "Cleanup — http_ports (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/http_port/deleted/converge.yml b/extensions/molecule/http_ports/deleted/converge.yml
similarity index 73%
rename from extensions/molecule/http_port/deleted/converge.yml
rename to extensions/molecule/http_ports/deleted/converge.yml
index d57a27a5..21792d93 100644
--- a/extensions/molecule/http_port/deleted/converge.yml
+++ b/extensions/molecule/http_ports/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (deleted)"
+- name: "Converge — http_ports (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=deleted
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=deleted
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/http_port/deleted/molecule.yml b/extensions/molecule/http_ports/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/deleted/molecule.yml
rename to extensions/molecule/http_ports/deleted/molecule.yml
diff --git a/extensions/molecule/http_port/gathered/prepare.yml b/extensions/molecule/http_ports/deleted/prepare.yml
similarity index 71%
rename from extensions/molecule/http_port/gathered/prepare.yml
rename to extensions/molecule/http_ports/deleted/prepare.yml
index 6d9fc225..8382797d 100644
--- a/extensions/molecule/http_port/gathered/prepare.yml
+++ b/extensions/molecule/http_ports/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — http_port (gathered)"
+- name: "Prepare — http_ports (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed http_port to be gathered (prerequisite for gathered)
-      ansible.platform.http_port:
+    - name: Seed http_ports to be deleted (prerequisite for deleted)
+      ansible.platform.http_ports:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/http_port/deleted/vars.yml b/extensions/molecule/http_ports/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/deleted/vars.yml
rename to extensions/molecule/http_ports/deleted/vars.yml
diff --git a/extensions/molecule/http_port/deleted/verify.yml b/extensions/molecule/http_ports/deleted/verify.yml
similarity index 82%
rename from extensions/molecule/http_port/deleted/verify.yml
rename to extensions/molecule/http_ports/deleted/verify.yml
index 98ff97be..ed8c4d26 100644
--- a/extensions/molecule/http_port/deleted/verify.yml
+++ b/extensions/molecule/http_ports/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (deleted)"
+- name: "Verify — http_ports (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather http_port (should be absent after deleted)
-      ansible.platform.http_port:
+    - name: Gather http_ports (should be absent after deleted)
+      ansible.platform.http_ports:
         config:
           - name: "int-port-alpha"
         state: gathered
diff --git a/extensions/molecule/http_port/gathered/cleanup.yml b/extensions/molecule/http_ports/gathered/cleanup.yml
similarity index 85%
rename from extensions/molecule/http_port/gathered/cleanup.yml
rename to extensions/molecule/http_ports/gathered/cleanup.yml
index 46d49208..41b9bc1a 100644
--- a/extensions/molecule/http_port/gathered/cleanup.yml
+++ b/extensions/molecule/http_ports/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — http_port (gathered)"
+- name: "Cleanup — http_ports (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-port-alpha (test teardown)
-      ansible.platform.http_port:
+      ansible.platform.http_ports:
         config:
           - name: "int-port-alpha"
         state: deleted
diff --git a/extensions/molecule/http_port/gathered/converge.yml b/extensions/molecule/http_ports/gathered/converge.yml
similarity index 73%
rename from extensions/molecule/http_port/gathered/converge.yml
rename to extensions/molecule/http_ports/gathered/converge.yml
index 60a26150..c81196f4 100644
--- a/extensions/molecule/http_port/gathered/converge.yml
+++ b/extensions/molecule/http_ports/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (gathered)"
+- name: "Converge — http_ports (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=gathered
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=gathered
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/http_port/gathered/molecule.yml b/extensions/molecule/http_ports/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/gathered/molecule.yml
rename to extensions/molecule/http_ports/gathered/molecule.yml
diff --git a/extensions/molecule/http_port/check/prepare.yml b/extensions/molecule/http_ports/gathered/prepare.yml
similarity index 71%
rename from extensions/molecule/http_port/check/prepare.yml
rename to extensions/molecule/http_ports/gathered/prepare.yml
index 5ebe7fa6..4c57f713 100644
--- a/extensions/molecule/http_port/check/prepare.yml
+++ b/extensions/molecule/http_ports/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — http_port (check)"
+- name: "Prepare — http_ports (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed http_port as check-mode baseline (prerequisite for check)
-      ansible.platform.http_port:
+    - name: Seed http_ports to be gathered (prerequisite for gathered)
+      ansible.platform.http_ports:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/http_port/gathered/vars.yml b/extensions/molecule/http_ports/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/gathered/vars.yml
rename to extensions/molecule/http_ports/gathered/vars.yml
diff --git a/extensions/molecule/http_port/gathered/verify.yml b/extensions/molecule/http_ports/gathered/verify.yml
similarity index 82%
rename from extensions/molecule/http_port/gathered/verify.yml
rename to extensions/molecule/http_ports/gathered/verify.yml
index aced5c6b..dd07592f 100644
--- a/extensions/molecule/http_port/gathered/verify.yml
+++ b/extensions/molecule/http_ports/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (gathered)"
+- name: "Verify — http_ports (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather http_port (assert present after gathered)
-      ansible.platform.http_port:
+    - name: Gather http_ports (assert present after gathered)
+      ansible.platform.http_ports:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/http_port/inventory.yml b/extensions/molecule/http_ports/inventory.yml
similarity index 100%
rename from extensions/molecule/http_port/inventory.yml
rename to extensions/molecule/http_ports/inventory.yml
diff --git a/extensions/molecule/http_port/merged/cleanup.yml b/extensions/molecule/http_ports/merged/cleanup.yml
similarity index 85%
rename from extensions/molecule/http_port/merged/cleanup.yml
rename to extensions/molecule/http_ports/merged/cleanup.yml
index eab7bfee..4c84014b 100644
--- a/extensions/molecule/http_port/merged/cleanup.yml
+++ b/extensions/molecule/http_ports/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — http_port (merged)"
+- name: "Cleanup — http_ports (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-port-alpha (test teardown)
-      ansible.platform.http_port:
+      ansible.platform.http_ports:
         config:
           - name: "int-port-alpha"
         state: deleted
diff --git a/extensions/molecule/http_port/merged/converge.yml b/extensions/molecule/http_ports/merged/converge.yml
similarity index 74%
rename from extensions/molecule/http_port/merged/converge.yml
rename to extensions/molecule/http_ports/merged/converge.yml
index c9328c18..ff80061f 100644
--- a/extensions/molecule/http_port/merged/converge.yml
+++ b/extensions/molecule/http_ports/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (merged)"
+- name: "Converge — http_ports (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=merged
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=merged
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/http_port/merged/molecule.yml b/extensions/molecule/http_ports/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/merged/molecule.yml
rename to extensions/molecule/http_ports/merged/molecule.yml
diff --git a/extensions/molecule/http_port/merged/vars.yml b/extensions/molecule/http_ports/merged/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/merged/vars.yml
rename to extensions/molecule/http_ports/merged/vars.yml
diff --git a/extensions/molecule/http_port/merged/verify.yml b/extensions/molecule/http_ports/merged/verify.yml
similarity index 83%
rename from extensions/molecule/http_port/merged/verify.yml
rename to extensions/molecule/http_ports/merged/verify.yml
index 2ac3c67e..f3294e3c 100644
--- a/extensions/molecule/http_port/merged/verify.yml
+++ b/extensions/molecule/http_ports/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (merged)"
+- name: "Verify — http_ports (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather http_port (assert present after merged)
-      ansible.platform.http_port:
+    - name: Gather http_ports (assert present after merged)
+      ansible.platform.http_ports:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/http_ports/overridden/cleanup.yml b/extensions/molecule/http_ports/overridden/cleanup.yml
new file mode 100644
index 00000000..cb9f8821
--- /dev/null
+++ b/extensions/molecule/http_ports/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — http_ports (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-port-alpha (test teardown)
+      ansible.platform.http_ports:
+        config:
+          - name: "int-port-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/http_port/overridden/converge.yml b/extensions/molecule/http_ports/overridden/converge.yml
similarity index 73%
rename from extensions/molecule/http_port/overridden/converge.yml
rename to extensions/molecule/http_ports/overridden/converge.yml
index 46d6be24..9eaef6e3 100644
--- a/extensions/molecule/http_port/overridden/converge.yml
+++ b/extensions/molecule/http_ports/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (overridden)"
+- name: "Converge — http_ports (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=overridden
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=overridden
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/http_port/overridden/molecule.yml b/extensions/molecule/http_ports/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/overridden/molecule.yml
rename to extensions/molecule/http_ports/overridden/molecule.yml
diff --git a/extensions/molecule/http_port/overridden/prepare.yml b/extensions/molecule/http_ports/overridden/prepare.yml
similarity index 84%
rename from extensions/molecule/http_port/overridden/prepare.yml
rename to extensions/molecule/http_ports/overridden/prepare.yml
index 7dc95686..8f5dbbb3 100644
--- a/extensions/molecule/http_port/overridden/prepare.yml
+++ b/extensions/molecule/http_ports/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — http_port (overridden)"
+- name: "Prepare — http_ports (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.http_port:
+      ansible.platform.http_ports:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/http_port/overridden/vars.yml b/extensions/molecule/http_ports/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/overridden/vars.yml
rename to extensions/molecule/http_ports/overridden/vars.yml
diff --git a/extensions/molecule/http_port/overridden/verify.yml b/extensions/molecule/http_ports/overridden/verify.yml
similarity index 87%
rename from extensions/molecule/http_port/overridden/verify.yml
rename to extensions/molecule/http_ports/overridden/verify.yml
index 0987e000..d1d316df 100644
--- a/extensions/molecule/http_port/overridden/verify.yml
+++ b/extensions/molecule/http_ports/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (overridden)"
+- name: "Verify — http_ports (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all http_port resources (verify overridden final state)
-      ansible.platform.http_port:
+    - name: Gather all http_ports resources (verify overridden final state)
+      ansible.platform.http_ports:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/http_port/overridden/cleanup.yml b/extensions/molecule/http_ports/replaced/cleanup.yml
similarity index 85%
rename from extensions/molecule/http_port/overridden/cleanup.yml
rename to extensions/molecule/http_ports/replaced/cleanup.yml
index c97e2125..200076d1 100644
--- a/extensions/molecule/http_port/overridden/cleanup.yml
+++ b/extensions/molecule/http_ports/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — http_port (overridden)"
+- name: "Cleanup — http_ports (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-port-alpha (test teardown)
-      ansible.platform.http_port:
+      ansible.platform.http_ports:
         config:
           - name: "int-port-alpha"
         state: deleted
diff --git a/extensions/molecule/http_port/replaced/converge.yml b/extensions/molecule/http_ports/replaced/converge.yml
similarity index 73%
rename from extensions/molecule/http_port/replaced/converge.yml
rename to extensions/molecule/http_ports/replaced/converge.yml
index b036e098..2c64f46a 100644
--- a/extensions/molecule/http_port/replaced/converge.yml
+++ b/extensions/molecule/http_ports/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — http_port (replaced)"
+- name: "Converge — http_ports (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.http_port with state=replaced
-      ansible.platform.http_port:
+    - name: Run ansible.platform.http_ports with state=replaced
+      ansible.platform.http_ports:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/http_port/replaced/molecule.yml b/extensions/molecule/http_ports/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/http_port/replaced/molecule.yml
rename to extensions/molecule/http_ports/replaced/molecule.yml
diff --git a/extensions/molecule/application/deleted/prepare.yml b/extensions/molecule/http_ports/replaced/prepare.yml
similarity index 71%
rename from extensions/molecule/application/deleted/prepare.yml
rename to extensions/molecule/http_ports/replaced/prepare.yml
index 88dd860f..71692ec5 100644
--- a/extensions/molecule/application/deleted/prepare.yml
+++ b/extensions/molecule/http_ports/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — application (deleted)"
+- name: "Prepare — http_ports (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed application to be deleted (prerequisite for deleted)
-      ansible.platform.application:
+    - name: Seed http_ports to be replaced (prerequisite for replaced)
+      ansible.platform.http_ports:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/http_port/replaced/vars.yml b/extensions/molecule/http_ports/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/http_port/replaced/vars.yml
rename to extensions/molecule/http_ports/replaced/vars.yml
diff --git a/extensions/molecule/http_port/replaced/verify.yml b/extensions/molecule/http_ports/replaced/verify.yml
similarity index 87%
rename from extensions/molecule/http_port/replaced/verify.yml
rename to extensions/molecule/http_ports/replaced/verify.yml
index d1a77cc3..990d45c0 100644
--- a/extensions/molecule/http_port/replaced/verify.yml
+++ b/extensions/molecule/http_ports/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — http_port (replaced)"
+- name: "Verify — http_ports (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather http_port (assert present after replaced)
-      ansible.platform.http_port:
+    - name: Gather http_ports (assert present after replaced)
+      ansible.platform.http_ports:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/organization/replaced/cleanup.yml b/extensions/molecule/organization/replaced/cleanup.yml
deleted file mode 100644
index c303495b..00000000
--- a/extensions/molecule/organization/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — organization (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-org-alpha (test teardown)
-      ansible.platform.organization:
-        config:
-          - name: "int-org-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/organization/check/cleanup.yml b/extensions/molecule/organizations/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/organization/check/cleanup.yml
rename to extensions/molecule/organizations/check/cleanup.yml
index 482c62d8..4b9af034 100644
--- a/extensions/molecule/organization/check/cleanup.yml
+++ b/extensions/molecule/organizations/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — organization (check)"
+- name: "Cleanup — organizations (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-org-alpha (test teardown)
-      ansible.platform.organization:
+      ansible.platform.organizations:
         config:
           - name: "int-org-alpha"
         state: deleted
diff --git a/extensions/molecule/authenticator/check/converge.yml b/extensions/molecule/organizations/check/converge.yml
similarity index 86%
rename from extensions/molecule/authenticator/check/converge.yml
rename to extensions/molecule/organizations/check/converge.yml
index 8e2a48d7..ab40d0f4 100644
--- a/extensions/molecule/authenticator/check/converge.yml
+++ b/extensions/molecule/organizations/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (check)"
+- name: "Converge — organizations (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=merged
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=merged
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/organization/check/molecule.yml b/extensions/molecule/organizations/check/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/check/molecule.yml
rename to extensions/molecule/organizations/check/molecule.yml
diff --git a/extensions/molecule/authenticator/check/prepare.yml b/extensions/molecule/organizations/check/prepare.yml
similarity index 72%
rename from extensions/molecule/authenticator/check/prepare.yml
rename to extensions/molecule/organizations/check/prepare.yml
index 570dc95a..e6b2083e 100644
--- a/extensions/molecule/authenticator/check/prepare.yml
+++ b/extensions/molecule/organizations/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator (check)"
+- name: "Prepare — organizations (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed authenticator as check-mode baseline (prerequisite for check)
-      ansible.platform.authenticator:
+    - name: Seed organizations as check-mode baseline (prerequisite for check)
+      ansible.platform.organizations:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/organization/check/vars.yml b/extensions/molecule/organizations/check/vars.yml
similarity index 100%
rename from extensions/molecule/organization/check/vars.yml
rename to extensions/molecule/organizations/check/vars.yml
diff --git a/extensions/molecule/organization/check/verify.yml b/extensions/molecule/organizations/check/verify.yml
similarity index 83%
rename from extensions/molecule/organization/check/verify.yml
rename to extensions/molecule/organizations/check/verify.yml
index 2910c958..79a9e073 100644
--- a/extensions/molecule/organization/check/verify.yml
+++ b/extensions/molecule/organizations/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (check)"
+- name: "Verify — organizations (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather organization (check mode must not have applied changes)
-      ansible.platform.organization:
+    - name: Gather organizations (check mode must not have applied changes)
+      ansible.platform.organizations:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/organization/deleted/cleanup.yml b/extensions/molecule/organizations/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/organization/deleted/cleanup.yml
rename to extensions/molecule/organizations/deleted/cleanup.yml
index 03cfe21a..d45968fb 100644
--- a/extensions/molecule/organization/deleted/cleanup.yml
+++ b/extensions/molecule/organizations/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — organization (deleted)"
+- name: "Cleanup — organizations (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/authenticator/deleted/converge.yml b/extensions/molecule/organizations/deleted/converge.yml
similarity index 73%
rename from extensions/molecule/authenticator/deleted/converge.yml
rename to extensions/molecule/organizations/deleted/converge.yml
index 55bf99bd..458482e0 100644
--- a/extensions/molecule/authenticator/deleted/converge.yml
+++ b/extensions/molecule/organizations/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (deleted)"
+- name: "Converge — organizations (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=deleted
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=deleted
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/organization/deleted/molecule.yml b/extensions/molecule/organizations/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/deleted/molecule.yml
rename to extensions/molecule/organizations/deleted/molecule.yml
diff --git a/extensions/molecule/authenticator/deleted/prepare.yml b/extensions/molecule/organizations/deleted/prepare.yml
similarity index 72%
rename from extensions/molecule/authenticator/deleted/prepare.yml
rename to extensions/molecule/organizations/deleted/prepare.yml
index 4dcae323..f8d2ac91 100644
--- a/extensions/molecule/authenticator/deleted/prepare.yml
+++ b/extensions/molecule/organizations/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator (deleted)"
+- name: "Prepare — organizations (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed authenticator to be deleted (prerequisite for deleted)
-      ansible.platform.authenticator:
+    - name: Seed organizations to be deleted (prerequisite for deleted)
+      ansible.platform.organizations:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/organization/deleted/vars.yml b/extensions/molecule/organizations/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/organization/deleted/vars.yml
rename to extensions/molecule/organizations/deleted/vars.yml
diff --git a/extensions/molecule/organization/deleted/verify.yml b/extensions/molecule/organizations/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/organization/deleted/verify.yml
rename to extensions/molecule/organizations/deleted/verify.yml
index 8df0a544..64db29da 100644
--- a/extensions/molecule/organization/deleted/verify.yml
+++ b/extensions/molecule/organizations/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (deleted)"
+- name: "Verify — organizations (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather organization (should be absent after deleted)
-      ansible.platform.organization:
+    - name: Gather organizations (should be absent after deleted)
+      ansible.platform.organizations:
         config:
           - name: "int-org-alpha"
         state: gathered
diff --git a/extensions/molecule/organization/merged/cleanup.yml b/extensions/molecule/organizations/gathered/cleanup.yml
similarity index 84%
rename from extensions/molecule/organization/merged/cleanup.yml
rename to extensions/molecule/organizations/gathered/cleanup.yml
index 02349f78..f22ca732 100644
--- a/extensions/molecule/organization/merged/cleanup.yml
+++ b/extensions/molecule/organizations/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — organization (merged)"
+- name: "Cleanup — organizations (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-org-alpha (test teardown)
-      ansible.platform.organization:
+      ansible.platform.organizations:
         config:
           - name: "int-org-alpha"
         state: deleted
diff --git a/extensions/molecule/authenticator/gathered/converge.yml b/extensions/molecule/organizations/gathered/converge.yml
similarity index 73%
rename from extensions/molecule/authenticator/gathered/converge.yml
rename to extensions/molecule/organizations/gathered/converge.yml
index 42302d78..c333c187 100644
--- a/extensions/molecule/authenticator/gathered/converge.yml
+++ b/extensions/molecule/organizations/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (gathered)"
+- name: "Converge — organizations (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=gathered
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=gathered
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/organization/gathered/molecule.yml b/extensions/molecule/organizations/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/gathered/molecule.yml
rename to extensions/molecule/organizations/gathered/molecule.yml
diff --git a/extensions/molecule/authenticator/gathered/prepare.yml b/extensions/molecule/organizations/gathered/prepare.yml
similarity index 72%
rename from extensions/molecule/authenticator/gathered/prepare.yml
rename to extensions/molecule/organizations/gathered/prepare.yml
index 27507172..df0f7ace 100644
--- a/extensions/molecule/authenticator/gathered/prepare.yml
+++ b/extensions/molecule/organizations/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator (gathered)"
+- name: "Prepare — organizations (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed authenticator to be gathered (prerequisite for gathered)
-      ansible.platform.authenticator:
+    - name: Seed organizations to be gathered (prerequisite for gathered)
+      ansible.platform.organizations:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/organization/gathered/vars.yml b/extensions/molecule/organizations/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/organization/gathered/vars.yml
rename to extensions/molecule/organizations/gathered/vars.yml
diff --git a/extensions/molecule/authenticator/gathered/verify.yml b/extensions/molecule/organizations/gathered/verify.yml
similarity index 82%
rename from extensions/molecule/authenticator/gathered/verify.yml
rename to extensions/molecule/organizations/gathered/verify.yml
index ce4b6408..7fbfcac4 100644
--- a/extensions/molecule/authenticator/gathered/verify.yml
+++ b/extensions/molecule/organizations/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (gathered)"
+- name: "Verify — organizations (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator (assert present after gathered)
-      ansible.platform.authenticator:
+    - name: Gather organizations (assert present after gathered)
+      ansible.platform.organizations:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/organization/inventory.yml b/extensions/molecule/organizations/inventory.yml
similarity index 100%
rename from extensions/molecule/organization/inventory.yml
rename to extensions/molecule/organizations/inventory.yml
diff --git a/extensions/molecule/organization/gathered/cleanup.yml b/extensions/molecule/organizations/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/organization/gathered/cleanup.yml
rename to extensions/molecule/organizations/merged/cleanup.yml
index e020a3c9..d33f1845 100644
--- a/extensions/molecule/organization/gathered/cleanup.yml
+++ b/extensions/molecule/organizations/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — organization (gathered)"
+- name: "Cleanup — organizations (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-org-alpha (test teardown)
-      ansible.platform.organization:
+      ansible.platform.organizations:
         config:
           - name: "int-org-alpha"
         state: deleted
diff --git a/extensions/molecule/authenticator/merged/converge.yml b/extensions/molecule/organizations/merged/converge.yml
similarity index 73%
rename from extensions/molecule/authenticator/merged/converge.yml
rename to extensions/molecule/organizations/merged/converge.yml
index 6aa81656..caaa4386 100644
--- a/extensions/molecule/authenticator/merged/converge.yml
+++ b/extensions/molecule/organizations/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (merged)"
+- name: "Converge — organizations (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=merged
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=merged
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/organization/merged/molecule.yml b/extensions/molecule/organizations/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/merged/molecule.yml
rename to extensions/molecule/organizations/merged/molecule.yml
diff --git a/extensions/molecule/organization/merged/vars.yml b/extensions/molecule/organizations/merged/vars.yml
similarity index 100%
rename from extensions/molecule/organization/merged/vars.yml
rename to extensions/molecule/organizations/merged/vars.yml
diff --git a/extensions/molecule/authenticator/merged/verify.yml b/extensions/molecule/organizations/merged/verify.yml
similarity index 82%
rename from extensions/molecule/authenticator/merged/verify.yml
rename to extensions/molecule/organizations/merged/verify.yml
index cbe3897c..70136b86 100644
--- a/extensions/molecule/authenticator/merged/verify.yml
+++ b/extensions/molecule/organizations/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — authenticator (merged)"
+- name: "Verify — organizations (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather authenticator (assert present after merged)
-      ansible.platform.authenticator:
+    - name: Gather organizations (assert present after merged)
+      ansible.platform.organizations:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/organizations/overridden/cleanup.yml b/extensions/molecule/organizations/overridden/cleanup.yml
new file mode 100644
index 00000000..c083e9f3
--- /dev/null
+++ b/extensions/molecule/organizations/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — organizations (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-org-alpha (test teardown)
+      ansible.platform.organizations:
+        config:
+          - name: "int-org-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/authenticator/overridden/converge.yml b/extensions/molecule/organizations/overridden/converge.yml
similarity index 72%
rename from extensions/molecule/authenticator/overridden/converge.yml
rename to extensions/molecule/organizations/overridden/converge.yml
index db35db1e..c8f68471 100644
--- a/extensions/molecule/authenticator/overridden/converge.yml
+++ b/extensions/molecule/organizations/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (overridden)"
+- name: "Converge — organizations (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=overridden
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=overridden
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/organization/overridden/molecule.yml b/extensions/molecule/organizations/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/overridden/molecule.yml
rename to extensions/molecule/organizations/overridden/molecule.yml
diff --git a/extensions/molecule/authenticator/overridden/prepare.yml b/extensions/molecule/organizations/overridden/prepare.yml
similarity index 83%
rename from extensions/molecule/authenticator/overridden/prepare.yml
rename to extensions/molecule/organizations/overridden/prepare.yml
index 7c30d367..9edf2ad7 100644
--- a/extensions/molecule/authenticator/overridden/prepare.yml
+++ b/extensions/molecule/organizations/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator (overridden)"
+- name: "Prepare — organizations (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.authenticator:
+      ansible.platform.organizations:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/organization/overridden/vars.yml b/extensions/molecule/organizations/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/organization/overridden/vars.yml
rename to extensions/molecule/organizations/overridden/vars.yml
diff --git a/extensions/molecule/organization/overridden/verify.yml b/extensions/molecule/organizations/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/organization/overridden/verify.yml
rename to extensions/molecule/organizations/overridden/verify.yml
index decf56db..a71c57f2 100644
--- a/extensions/molecule/organization/overridden/verify.yml
+++ b/extensions/molecule/organizations/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (overridden)"
+- name: "Verify — organizations (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all organization resources (verify overridden final state)
-      ansible.platform.organization:
+    - name: Gather all organizations resources (verify overridden final state)
+      ansible.platform.organizations:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/organization/overridden/cleanup.yml b/extensions/molecule/organizations/replaced/cleanup.yml
similarity index 84%
rename from extensions/molecule/organization/overridden/cleanup.yml
rename to extensions/molecule/organizations/replaced/cleanup.yml
index 343dddca..6114d577 100644
--- a/extensions/molecule/organization/overridden/cleanup.yml
+++ b/extensions/molecule/organizations/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — organization (overridden)"
+- name: "Cleanup — organizations (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-org-alpha (test teardown)
-      ansible.platform.organization:
+      ansible.platform.organizations:
         config:
           - name: "int-org-alpha"
         state: deleted
diff --git a/extensions/molecule/authenticator/replaced/converge.yml b/extensions/molecule/organizations/replaced/converge.yml
similarity index 73%
rename from extensions/molecule/authenticator/replaced/converge.yml
rename to extensions/molecule/organizations/replaced/converge.yml
index 6fe08cf2..daf0c11c 100644
--- a/extensions/molecule/authenticator/replaced/converge.yml
+++ b/extensions/molecule/organizations/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — authenticator (replaced)"
+- name: "Converge — organizations (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.authenticator with state=replaced
-      ansible.platform.authenticator:
+    - name: Run ansible.platform.organizations with state=replaced
+      ansible.platform.organizations:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/organization/replaced/molecule.yml b/extensions/molecule/organizations/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/organization/replaced/molecule.yml
rename to extensions/molecule/organizations/replaced/molecule.yml
diff --git a/extensions/molecule/authenticator/replaced/prepare.yml b/extensions/molecule/organizations/replaced/prepare.yml
similarity index 72%
rename from extensions/molecule/authenticator/replaced/prepare.yml
rename to extensions/molecule/organizations/replaced/prepare.yml
index a1f65365..bc6b65eb 100644
--- a/extensions/molecule/authenticator/replaced/prepare.yml
+++ b/extensions/molecule/organizations/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — authenticator (replaced)"
+- name: "Prepare — organizations (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed authenticator to be replaced (prerequisite for replaced)
-      ansible.platform.authenticator:
+    - name: Seed organizations to be replaced (prerequisite for replaced)
+      ansible.platform.organizations:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/organization/replaced/vars.yml b/extensions/molecule/organizations/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/organization/replaced/vars.yml
rename to extensions/molecule/organizations/replaced/vars.yml
diff --git a/extensions/molecule/organization/replaced/verify.yml b/extensions/molecule/organizations/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/organization/replaced/verify.yml
rename to extensions/molecule/organizations/replaced/verify.yml
index 0ae1e1c5..c2707a10 100644
--- a/extensions/molecule/organization/replaced/verify.yml
+++ b/extensions/molecule/organizations/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (replaced)"
+- name: "Verify — organizations (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather organization (assert present after replaced)
-      ansible.platform.organization:
+    - name: Gather organizations (assert present after replaced)
+      ansible.platform.organizations:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/role_definition/overridden/prepare.yml b/extensions/molecule/role_definition/overridden/prepare.yml
deleted file mode 100644
index cd848b0c..00000000
--- a/extensions/molecule/role_definition/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — role_definition (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.role_definition:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/role_definition/replaced/cleanup.yml b/extensions/molecule/role_definition/replaced/cleanup.yml
deleted file mode 100644
index 7e137cc6..00000000
--- a/extensions/molecule/role_definition/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — role_definition (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-roledef-alpha (test teardown)
-      ansible.platform.role_definition:
-        config:
-          - name: "int-roledef-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/role_definition/check/cleanup.yml b/extensions/molecule/role_definitions/check/cleanup.yml
similarity index 83%
rename from extensions/molecule/role_definition/check/cleanup.yml
rename to extensions/molecule/role_definitions/check/cleanup.yml
index 8523809d..07fe608d 100644
--- a/extensions/molecule/role_definition/check/cleanup.yml
+++ b/extensions/molecule/role_definitions/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — role_definition (check)"
+- name: "Cleanup — role_definitions (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-roledef-alpha (test teardown)
-      ansible.platform.role_definition:
+      ansible.platform.role_definitions:
         config:
           - name: "int-roledef-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definitions/check/converge.yml b/extensions/molecule/role_definitions/check/converge.yml
new file mode 100644
index 00000000..74db82cc
--- /dev/null
+++ b/extensions/molecule/role_definitions/check/converge.yml
@@ -0,0 +1,36 @@
+---
+- name: "Converge — role_definitions (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=merged
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      check_mode: true
+      diff: true
+      register: result
+
+    - name: Assert check mode predicted a change
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.before is defined
+          - result.after is defined
+        fail_msg: "check mode should predict a change. got={{ result }}"
+
+    - name: Assert diff output is present
+      ansible.builtin.assert:
+        that:
+          - result.diff is defined
+        fail_msg: "diff output missing from check result"
+      when: result.diff is defined
+
+...
diff --git a/extensions/molecule/role_definition/check/molecule.yml b/extensions/molecule/role_definitions/check/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/check/molecule.yml
rename to extensions/molecule/role_definitions/check/molecule.yml
diff --git a/extensions/molecule/role_definitions/check/prepare.yml b/extensions/molecule/role_definitions/check/prepare.yml
new file mode 100644
index 00000000..67ef9daf
--- /dev/null
+++ b/extensions/molecule/role_definitions/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — role_definitions (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed role_definitions as check-mode baseline (prerequisite for check)
+      ansible.platform.role_definitions:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/role_definition/check/vars.yml b/extensions/molecule/role_definitions/check/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/check/vars.yml
rename to extensions/molecule/role_definitions/check/vars.yml
diff --git a/extensions/molecule/role_definition/check/verify.yml b/extensions/molecule/role_definitions/check/verify.yml
similarity index 82%
rename from extensions/molecule/role_definition/check/verify.yml
rename to extensions/molecule/role_definitions/check/verify.yml
index 25c391d7..db7daf89 100644
--- a/extensions/molecule/role_definition/check/verify.yml
+++ b/extensions/molecule/role_definitions/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (check)"
+- name: "Verify — role_definitions (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather role_definition (check mode must not have applied changes)
-      ansible.platform.role_definition:
+    - name: Gather role_definitions (check mode must not have applied changes)
+      ansible.platform.role_definitions:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/role_definition/deleted/cleanup.yml b/extensions/molecule/role_definitions/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/role_definition/deleted/cleanup.yml
rename to extensions/molecule/role_definitions/deleted/cleanup.yml
index ac8aaaf6..0e91f70a 100644
--- a/extensions/molecule/role_definition/deleted/cleanup.yml
+++ b/extensions/molecule/role_definitions/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — role_definition (deleted)"
+- name: "Cleanup — role_definitions (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/role_definitions/deleted/converge.yml b/extensions/molecule/role_definitions/deleted/converge.yml
new file mode 100644
index 00000000..35cbd085
--- /dev/null
+++ b/extensions/molecule/role_definitions/deleted/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — role_definitions (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=deleted
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/role_definition/deleted/molecule.yml b/extensions/molecule/role_definitions/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/deleted/molecule.yml
rename to extensions/molecule/role_definitions/deleted/molecule.yml
diff --git a/extensions/molecule/application/gathered/prepare.yml b/extensions/molecule/role_definitions/deleted/prepare.yml
similarity index 69%
rename from extensions/molecule/application/gathered/prepare.yml
rename to extensions/molecule/role_definitions/deleted/prepare.yml
index 5d22e775..be267315 100644
--- a/extensions/molecule/application/gathered/prepare.yml
+++ b/extensions/molecule/role_definitions/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — application (gathered)"
+- name: "Prepare — role_definitions (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed application to be gathered (prerequisite for gathered)
-      ansible.platform.application:
+    - name: Seed role_definitions to be deleted (prerequisite for deleted)
+      ansible.platform.role_definitions:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/role_definition/deleted/vars.yml b/extensions/molecule/role_definitions/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/deleted/vars.yml
rename to extensions/molecule/role_definitions/deleted/vars.yml
diff --git a/extensions/molecule/role_definition/deleted/verify.yml b/extensions/molecule/role_definitions/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/role_definition/deleted/verify.yml
rename to extensions/molecule/role_definitions/deleted/verify.yml
index 0dc39269..0eceaf15 100644
--- a/extensions/molecule/role_definition/deleted/verify.yml
+++ b/extensions/molecule/role_definitions/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (deleted)"
+- name: "Verify — role_definitions (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather role_definition (should be absent after deleted)
-      ansible.platform.role_definition:
+    - name: Gather role_definitions (should be absent after deleted)
+      ansible.platform.role_definitions:
         config:
           - name: "int-roledef-alpha"
         state: gathered
diff --git a/extensions/molecule/role_definition/merged/cleanup.yml b/extensions/molecule/role_definitions/gathered/cleanup.yml
similarity index 83%
rename from extensions/molecule/role_definition/merged/cleanup.yml
rename to extensions/molecule/role_definitions/gathered/cleanup.yml
index 3dd907df..42346a15 100644
--- a/extensions/molecule/role_definition/merged/cleanup.yml
+++ b/extensions/molecule/role_definitions/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — role_definition (merged)"
+- name: "Cleanup — role_definitions (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-roledef-alpha (test teardown)
-      ansible.platform.role_definition:
+      ansible.platform.role_definitions:
         config:
           - name: "int-roledef-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definitions/gathered/converge.yml b/extensions/molecule/role_definitions/gathered/converge.yml
new file mode 100644
index 00000000..c9d327e0
--- /dev/null
+++ b/extensions/molecule/role_definitions/gathered/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — role_definitions (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=gathered
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/role_definition/gathered/molecule.yml b/extensions/molecule/role_definitions/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/gathered/molecule.yml
rename to extensions/molecule/role_definitions/gathered/molecule.yml
diff --git a/extensions/molecule/role_definitions/gathered/prepare.yml b/extensions/molecule/role_definitions/gathered/prepare.yml
new file mode 100644
index 00000000..405b2433
--- /dev/null
+++ b/extensions/molecule/role_definitions/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — role_definitions (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed role_definitions to be gathered (prerequisite for gathered)
+      ansible.platform.role_definitions:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/role_definition/gathered/vars.yml b/extensions/molecule/role_definitions/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/gathered/vars.yml
rename to extensions/molecule/role_definitions/gathered/vars.yml
diff --git a/extensions/molecule/role_definitions/gathered/verify.yml b/extensions/molecule/role_definitions/gathered/verify.yml
new file mode 100644
index 00000000..1b39045c
--- /dev/null
+++ b/extensions/molecule/role_definitions/gathered/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — role_definitions (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather role_definitions (assert present after gathered)
+      ansible.platform.role_definitions:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after gathered
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/role_definition/inventory.yml b/extensions/molecule/role_definitions/inventory.yml
similarity index 100%
rename from extensions/molecule/role_definition/inventory.yml
rename to extensions/molecule/role_definitions/inventory.yml
diff --git a/extensions/molecule/role_definition/gathered/cleanup.yml b/extensions/molecule/role_definitions/merged/cleanup.yml
similarity index 83%
rename from extensions/molecule/role_definition/gathered/cleanup.yml
rename to extensions/molecule/role_definitions/merged/cleanup.yml
index 89432393..455b32bd 100644
--- a/extensions/molecule/role_definition/gathered/cleanup.yml
+++ b/extensions/molecule/role_definitions/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — role_definition (gathered)"
+- name: "Cleanup — role_definitions (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-roledef-alpha (test teardown)
-      ansible.platform.role_definition:
+      ansible.platform.role_definitions:
         config:
           - name: "int-roledef-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definitions/merged/converge.yml b/extensions/molecule/role_definitions/merged/converge.yml
new file mode 100644
index 00000000..13a3dd46
--- /dev/null
+++ b/extensions/molecule/role_definitions/merged/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — role_definitions (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=merged
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/role_definition/merged/molecule.yml b/extensions/molecule/role_definitions/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/merged/molecule.yml
rename to extensions/molecule/role_definitions/merged/molecule.yml
diff --git a/extensions/molecule/role_definition/merged/vars.yml b/extensions/molecule/role_definitions/merged/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/merged/vars.yml
rename to extensions/molecule/role_definitions/merged/vars.yml
diff --git a/extensions/molecule/role_definitions/merged/verify.yml b/extensions/molecule/role_definitions/merged/verify.yml
new file mode 100644
index 00000000..b871b448
--- /dev/null
+++ b/extensions/molecule/role_definitions/merged/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — role_definitions (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather role_definitions (assert present after merged)
+      ansible.platform.role_definitions:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after merged
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/role_definitions/overridden/cleanup.yml b/extensions/molecule/role_definitions/overridden/cleanup.yml
new file mode 100644
index 00000000..b7d22250
--- /dev/null
+++ b/extensions/molecule/role_definitions/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — role_definitions (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-roledef-alpha (test teardown)
+      ansible.platform.role_definitions:
+        config:
+          - name: "int-roledef-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/role_definitions/overridden/converge.yml b/extensions/molecule/role_definitions/overridden/converge.yml
new file mode 100644
index 00000000..a106d82c
--- /dev/null
+++ b/extensions/molecule/role_definitions/overridden/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — role_definitions (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=overridden
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: overridden
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/role_definition/overridden/molecule.yml b/extensions/molecule/role_definitions/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/overridden/molecule.yml
rename to extensions/molecule/role_definitions/overridden/molecule.yml
diff --git a/extensions/molecule/role_definitions/overridden/prepare.yml b/extensions/molecule/role_definitions/overridden/prepare.yml
new file mode 100644
index 00000000..44ef5492
--- /dev/null
+++ b/extensions/molecule/role_definitions/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — role_definitions (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.role_definitions:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/role_definition/overridden/vars.yml b/extensions/molecule/role_definitions/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/overridden/vars.yml
rename to extensions/molecule/role_definitions/overridden/vars.yml
diff --git a/extensions/molecule/role_definition/overridden/verify.yml b/extensions/molecule/role_definitions/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/role_definition/overridden/verify.yml
rename to extensions/molecule/role_definitions/overridden/verify.yml
index 08866d3d..21b02eb3 100644
--- a/extensions/molecule/role_definition/overridden/verify.yml
+++ b/extensions/molecule/role_definitions/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (overridden)"
+- name: "Verify — role_definitions (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all role_definition resources (verify overridden final state)
-      ansible.platform.role_definition:
+    - name: Gather all role_definitions resources (verify overridden final state)
+      ansible.platform.role_definitions:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/role_definition/overridden/cleanup.yml b/extensions/molecule/role_definitions/replaced/cleanup.yml
similarity index 83%
rename from extensions/molecule/role_definition/overridden/cleanup.yml
rename to extensions/molecule/role_definitions/replaced/cleanup.yml
index 0aa33982..9e59371b 100644
--- a/extensions/molecule/role_definition/overridden/cleanup.yml
+++ b/extensions/molecule/role_definitions/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — role_definition (overridden)"
+- name: "Cleanup — role_definitions (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-roledef-alpha (test teardown)
-      ansible.platform.role_definition:
+      ansible.platform.role_definitions:
         config:
           - name: "int-roledef-alpha"
         state: deleted
diff --git a/extensions/molecule/role_definitions/replaced/converge.yml b/extensions/molecule/role_definitions/replaced/converge.yml
new file mode 100644
index 00000000..6cf7c8c1
--- /dev/null
+++ b/extensions/molecule/role_definitions/replaced/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — role_definitions (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.role_definitions with state=replaced
+      ansible.platform.role_definitions:
+        config:
+          - "{{ expected_config }}"
+        state: replaced
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/role_definition/replaced/molecule.yml b/extensions/molecule/role_definitions/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/role_definition/replaced/molecule.yml
rename to extensions/molecule/role_definitions/replaced/molecule.yml
diff --git a/extensions/molecule/role_definitions/replaced/prepare.yml b/extensions/molecule/role_definitions/replaced/prepare.yml
new file mode 100644
index 00000000..78a0a59a
--- /dev/null
+++ b/extensions/molecule/role_definitions/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — role_definitions (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed role_definitions to be replaced (prerequisite for replaced)
+      ansible.platform.role_definitions:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/role_definition/replaced/vars.yml b/extensions/molecule/role_definitions/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/role_definition/replaced/vars.yml
rename to extensions/molecule/role_definitions/replaced/vars.yml
diff --git a/extensions/molecule/role_definition/replaced/verify.yml b/extensions/molecule/role_definitions/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/role_definition/replaced/verify.yml
rename to extensions/molecule/role_definitions/replaced/verify.yml
index e99b2a03..84902d86 100644
--- a/extensions/molecule/role_definition/replaced/verify.yml
+++ b/extensions/molecule/role_definitions/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — role_definition (replaced)"
+- name: "Verify — role_definitions (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather role_definition (assert present after replaced)
-      ansible.platform.role_definition:
+    - name: Gather role_definitions (assert present after replaced)
+      ansible.platform.role_definitions:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/route/replaced/cleanup.yml b/extensions/molecule/route/replaced/cleanup.yml
deleted file mode 100644
index 3c6c7648..00000000
--- a/extensions/molecule/route/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — route (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-route-alpha (test teardown)
-      ansible.platform.route:
-        config:
-          - name: "int-route-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/route/merged/cleanup.yml b/extensions/molecule/routes/check/cleanup.yml
similarity index 86%
rename from extensions/molecule/route/merged/cleanup.yml
rename to extensions/molecule/routes/check/cleanup.yml
index a842d9cc..0a9a071a 100644
--- a/extensions/molecule/route/merged/cleanup.yml
+++ b/extensions/molecule/routes/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — route (merged)"
+- name: "Cleanup — routes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-route-alpha (test teardown)
-      ansible.platform.route:
+      ansible.platform.routes:
         config:
           - name: "int-route-alpha"
         state: deleted
diff --git a/extensions/molecule/user/check/converge.yml b/extensions/molecule/routes/check/converge.yml
similarity index 87%
rename from extensions/molecule/user/check/converge.yml
rename to extensions/molecule/routes/check/converge.yml
index 48f74f0e..3b1ed86b 100644
--- a/extensions/molecule/user/check/converge.yml
+++ b/extensions/molecule/routes/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (check)"
+- name: "Converge — routes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=merged
-      ansible.platform.user:
+    - name: Run ansible.platform.routes with state=merged
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/route/check/molecule.yml b/extensions/molecule/routes/check/molecule.yml
similarity index 100%
rename from extensions/molecule/route/check/molecule.yml
rename to extensions/molecule/routes/check/molecule.yml
diff --git a/extensions/molecule/routes/check/prepare.yml b/extensions/molecule/routes/check/prepare.yml
new file mode 100644
index 00000000..df410750
--- /dev/null
+++ b/extensions/molecule/routes/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — routes (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed routes as check-mode baseline (prerequisite for check)
+      ansible.platform.routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/route/check/vars.yml b/extensions/molecule/routes/check/vars.yml
similarity index 100%
rename from extensions/molecule/route/check/vars.yml
rename to extensions/molecule/routes/check/vars.yml
diff --git a/extensions/molecule/route/check/verify.yml b/extensions/molecule/routes/check/verify.yml
similarity index 85%
rename from extensions/molecule/route/check/verify.yml
rename to extensions/molecule/routes/check/verify.yml
index ab729a6c..6e37596a 100644
--- a/extensions/molecule/route/check/verify.yml
+++ b/extensions/molecule/routes/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (check)"
+- name: "Verify — routes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather route (check mode must not have applied changes)
-      ansible.platform.route:
+    - name: Gather routes (check mode must not have applied changes)
+      ansible.platform.routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/route/deleted/cleanup.yml b/extensions/molecule/routes/deleted/cleanup.yml
similarity index 87%
rename from extensions/molecule/route/deleted/cleanup.yml
rename to extensions/molecule/routes/deleted/cleanup.yml
index 868ee7c4..a8bea5c5 100644
--- a/extensions/molecule/route/deleted/cleanup.yml
+++ b/extensions/molecule/routes/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — route (deleted)"
+- name: "Cleanup — routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/user/deleted/converge.yml b/extensions/molecule/routes/deleted/converge.yml
similarity index 75%
rename from extensions/molecule/user/deleted/converge.yml
rename to extensions/molecule/routes/deleted/converge.yml
index 7015338b..6a731e9c 100644
--- a/extensions/molecule/user/deleted/converge.yml
+++ b/extensions/molecule/routes/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (deleted)"
+- name: "Converge — routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=deleted
-      ansible.platform.user:
+    - name: Run ansible.platform.routes with state=deleted
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/route/deleted/molecule.yml b/extensions/molecule/routes/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/route/deleted/molecule.yml
rename to extensions/molecule/routes/deleted/molecule.yml
diff --git a/extensions/molecule/team/gathered/prepare.yml b/extensions/molecule/routes/deleted/prepare.yml
similarity index 73%
rename from extensions/molecule/team/gathered/prepare.yml
rename to extensions/molecule/routes/deleted/prepare.yml
index e8b670f7..1c450c55 100644
--- a/extensions/molecule/team/gathered/prepare.yml
+++ b/extensions/molecule/routes/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — team (gathered)"
+- name: "Prepare — routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed team to be gathered (prerequisite for gathered)
-      ansible.platform.team:
+    - name: Seed routes to be deleted (prerequisite for deleted)
+      ansible.platform.routes:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/route/deleted/vars.yml b/extensions/molecule/routes/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/route/deleted/vars.yml
rename to extensions/molecule/routes/deleted/vars.yml
diff --git a/extensions/molecule/route/deleted/verify.yml b/extensions/molecule/routes/deleted/verify.yml
similarity index 84%
rename from extensions/molecule/route/deleted/verify.yml
rename to extensions/molecule/routes/deleted/verify.yml
index c6d53abb..d97a3625 100644
--- a/extensions/molecule/route/deleted/verify.yml
+++ b/extensions/molecule/routes/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (deleted)"
+- name: "Verify — routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather route (should be absent after deleted)
-      ansible.platform.route:
+    - name: Gather routes (should be absent after deleted)
+      ansible.platform.routes:
         config:
           - name: "int-route-alpha"
         state: gathered
diff --git a/extensions/molecule/route/overridden/cleanup.yml b/extensions/molecule/routes/gathered/cleanup.yml
similarity index 86%
rename from extensions/molecule/route/overridden/cleanup.yml
rename to extensions/molecule/routes/gathered/cleanup.yml
index 067a6c49..0343137f 100644
--- a/extensions/molecule/route/overridden/cleanup.yml
+++ b/extensions/molecule/routes/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — route (overridden)"
+- name: "Cleanup — routes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-route-alpha (test teardown)
-      ansible.platform.route:
+      ansible.platform.routes:
         config:
           - name: "int-route-alpha"
         state: deleted
diff --git a/extensions/molecule/user/gathered/converge.yml b/extensions/molecule/routes/gathered/converge.yml
similarity index 75%
rename from extensions/molecule/user/gathered/converge.yml
rename to extensions/molecule/routes/gathered/converge.yml
index 9d100a46..ef452669 100644
--- a/extensions/molecule/user/gathered/converge.yml
+++ b/extensions/molecule/routes/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (gathered)"
+- name: "Converge — routes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=gathered
-      ansible.platform.user:
+    - name: Run ansible.platform.routes with state=gathered
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/route/gathered/molecule.yml b/extensions/molecule/routes/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/route/gathered/molecule.yml
rename to extensions/molecule/routes/gathered/molecule.yml
diff --git a/extensions/molecule/routes/gathered/prepare.yml b/extensions/molecule/routes/gathered/prepare.yml
new file mode 100644
index 00000000..198df1c1
--- /dev/null
+++ b/extensions/molecule/routes/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — routes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed routes to be gathered (prerequisite for gathered)
+      ansible.platform.routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/route/gathered/vars.yml b/extensions/molecule/routes/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/route/gathered/vars.yml
rename to extensions/molecule/routes/gathered/vars.yml
diff --git a/extensions/molecule/route/gathered/verify.yml b/extensions/molecule/routes/gathered/verify.yml
similarity index 84%
rename from extensions/molecule/route/gathered/verify.yml
rename to extensions/molecule/routes/gathered/verify.yml
index 1dacca3c..9bca9594 100644
--- a/extensions/molecule/route/gathered/verify.yml
+++ b/extensions/molecule/routes/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (gathered)"
+- name: "Verify — routes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather route (assert present after gathered)
-      ansible.platform.route:
+    - name: Gather routes (assert present after gathered)
+      ansible.platform.routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/route/inventory.yml b/extensions/molecule/routes/inventory.yml
similarity index 100%
rename from extensions/molecule/route/inventory.yml
rename to extensions/molecule/routes/inventory.yml
diff --git a/extensions/molecule/route/gathered/cleanup.yml b/extensions/molecule/routes/merged/cleanup.yml
similarity index 86%
rename from extensions/molecule/route/gathered/cleanup.yml
rename to extensions/molecule/routes/merged/cleanup.yml
index 0593cedf..0eadcf1c 100644
--- a/extensions/molecule/route/gathered/cleanup.yml
+++ b/extensions/molecule/routes/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — route (gathered)"
+- name: "Cleanup — routes (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-route-alpha (test teardown)
-      ansible.platform.route:
+      ansible.platform.routes:
         config:
           - name: "int-route-alpha"
         state: deleted
diff --git a/extensions/molecule/team/merged/converge.yml b/extensions/molecule/routes/merged/converge.yml
similarity index 75%
rename from extensions/molecule/team/merged/converge.yml
rename to extensions/molecule/routes/merged/converge.yml
index c1ce8240..994630c9 100644
--- a/extensions/molecule/team/merged/converge.yml
+++ b/extensions/molecule/routes/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (merged)"
+- name: "Converge — routes (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=merged
-      ansible.platform.team:
+    - name: Run ansible.platform.routes with state=merged
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/route/merged/molecule.yml b/extensions/molecule/routes/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/route/merged/molecule.yml
rename to extensions/molecule/routes/merged/molecule.yml
diff --git a/extensions/molecule/route/merged/vars.yml b/extensions/molecule/routes/merged/vars.yml
similarity index 100%
rename from extensions/molecule/route/merged/vars.yml
rename to extensions/molecule/routes/merged/vars.yml
diff --git a/extensions/molecule/team/merged/verify.yml b/extensions/molecule/routes/merged/verify.yml
similarity index 84%
rename from extensions/molecule/team/merged/verify.yml
rename to extensions/molecule/routes/merged/verify.yml
index bc607fbb..0c0a1c8e 100644
--- a/extensions/molecule/team/merged/verify.yml
+++ b/extensions/molecule/routes/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (merged)"
+- name: "Verify — routes (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather team (assert present after merged)
-      ansible.platform.team:
+    - name: Gather routes (assert present after merged)
+      ansible.platform.routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/routes/overridden/cleanup.yml b/extensions/molecule/routes/overridden/cleanup.yml
new file mode 100644
index 00000000..15b2d798
--- /dev/null
+++ b/extensions/molecule/routes/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — routes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-route-alpha (test teardown)
+      ansible.platform.routes:
+        config:
+          - name: "int-route-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/team/overridden/converge.yml b/extensions/molecule/routes/overridden/converge.yml
similarity index 74%
rename from extensions/molecule/team/overridden/converge.yml
rename to extensions/molecule/routes/overridden/converge.yml
index 1d9b35c6..635ee64f 100644
--- a/extensions/molecule/team/overridden/converge.yml
+++ b/extensions/molecule/routes/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (overridden)"
+- name: "Converge — routes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=overridden
-      ansible.platform.team:
+    - name: Run ansible.platform.routes with state=overridden
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/route/overridden/molecule.yml b/extensions/molecule/routes/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/route/overridden/molecule.yml
rename to extensions/molecule/routes/overridden/molecule.yml
diff --git a/extensions/molecule/user/overridden/prepare.yml b/extensions/molecule/routes/overridden/prepare.yml
similarity index 86%
rename from extensions/molecule/user/overridden/prepare.yml
rename to extensions/molecule/routes/overridden/prepare.yml
index 657b0842..30ce1fe0 100644
--- a/extensions/molecule/user/overridden/prepare.yml
+++ b/extensions/molecule/routes/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — user (overridden)"
+- name: "Prepare — routes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.user:
+      ansible.platform.routes:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/route/overridden/vars.yml b/extensions/molecule/routes/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/route/overridden/vars.yml
rename to extensions/molecule/routes/overridden/vars.yml
diff --git a/extensions/molecule/route/overridden/verify.yml b/extensions/molecule/routes/overridden/verify.yml
similarity index 88%
rename from extensions/molecule/route/overridden/verify.yml
rename to extensions/molecule/routes/overridden/verify.yml
index 497ae8fe..43c08b65 100644
--- a/extensions/molecule/route/overridden/verify.yml
+++ b/extensions/molecule/routes/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (overridden)"
+- name: "Verify — routes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all route resources (verify overridden final state)
-      ansible.platform.route:
+    - name: Gather all routes resources (verify overridden final state)
+      ansible.platform.routes:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/route/check/cleanup.yml b/extensions/molecule/routes/replaced/cleanup.yml
similarity index 86%
rename from extensions/molecule/route/check/cleanup.yml
rename to extensions/molecule/routes/replaced/cleanup.yml
index 4a434daa..b488aaab 100644
--- a/extensions/molecule/route/check/cleanup.yml
+++ b/extensions/molecule/routes/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — route (check)"
+- name: "Cleanup — routes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-route-alpha (test teardown)
-      ansible.platform.route:
+      ansible.platform.routes:
         config:
           - name: "int-route-alpha"
         state: deleted
diff --git a/extensions/molecule/user/replaced/converge.yml b/extensions/molecule/routes/replaced/converge.yml
similarity index 75%
rename from extensions/molecule/user/replaced/converge.yml
rename to extensions/molecule/routes/replaced/converge.yml
index dbdd981c..9adf0c7d 100644
--- a/extensions/molecule/user/replaced/converge.yml
+++ b/extensions/molecule/routes/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (replaced)"
+- name: "Converge — routes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=replaced
-      ansible.platform.user:
+    - name: Run ansible.platform.routes with state=replaced
+      ansible.platform.routes:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/route/replaced/molecule.yml b/extensions/molecule/routes/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/route/replaced/molecule.yml
rename to extensions/molecule/routes/replaced/molecule.yml
diff --git a/extensions/molecule/routes/replaced/prepare.yml b/extensions/molecule/routes/replaced/prepare.yml
new file mode 100644
index 00000000..d6ce280e
--- /dev/null
+++ b/extensions/molecule/routes/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — routes (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed routes to be replaced (prerequisite for replaced)
+      ansible.platform.routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/route/replaced/vars.yml b/extensions/molecule/routes/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/route/replaced/vars.yml
rename to extensions/molecule/routes/replaced/vars.yml
diff --git a/extensions/molecule/route/replaced/verify.yml b/extensions/molecule/routes/replaced/verify.yml
similarity index 88%
rename from extensions/molecule/route/replaced/verify.yml
rename to extensions/molecule/routes/replaced/verify.yml
index 362e4d8b..8deb24d9 100644
--- a/extensions/molecule/route/replaced/verify.yml
+++ b/extensions/molecule/routes/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (replaced)"
+- name: "Verify — routes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather route (assert present after replaced)
-      ansible.platform.route:
+    - name: Gather routes (assert present after replaced)
+      ansible.platform.routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service/check/prepare.yml b/extensions/molecule/service/check/prepare.yml
deleted file mode 100644
index 6cb14305..00000000
--- a/extensions/molecule/service/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service as check-mode baseline (prerequisite for check)
-      ansible.platform.service:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service/deleted/prepare.yml b/extensions/molecule/service/deleted/prepare.yml
deleted file mode 100644
index 06fed9c6..00000000
--- a/extensions/molecule/service/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service to be deleted (prerequisite for deleted)
-      ansible.platform.service:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service/gathered/prepare.yml b/extensions/molecule/service/gathered/prepare.yml
deleted file mode 100644
index 466408dd..00000000
--- a/extensions/molecule/service/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service to be gathered (prerequisite for gathered)
-      ansible.platform.service:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service/replaced/cleanup.yml b/extensions/molecule/service/replaced/cleanup.yml
deleted file mode 100644
index 103c9738..00000000
--- a/extensions/molecule/service/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — service (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-svc-alpha (test teardown)
-      ansible.platform.service:
-        config:
-          - name: "int-svc-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/service/replaced/prepare.yml b/extensions/molecule/service/replaced/prepare.yml
deleted file mode 100644
index d83eb846..00000000
--- a/extensions/molecule/service/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service to be replaced (prerequisite for replaced)
-      ansible.platform.service:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/check/converge.yml b/extensions/molecule/service_cluster/check/converge.yml
deleted file mode 100644
index 55747213..00000000
--- a/extensions/molecule/service_cluster/check/converge.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: "Converge — service_cluster (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=merged
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      check_mode: true
-      diff: true
-      register: result
-
-    - name: Assert check mode predicted a change
-      ansible.builtin.assert:
-        that:
-          - result.changed == true
-          - result.before is defined
-          - result.after is defined
-        fail_msg: "check mode should predict a change. got={{ result }}"
-
-    - name: Assert diff output is present
-      ansible.builtin.assert:
-        that:
-          - result.diff is defined
-        fail_msg: "diff output missing from check result"
-      when: result.diff is defined
-
-...
diff --git a/extensions/molecule/service_cluster/check/prepare.yml b/extensions/molecule/service_cluster/check/prepare.yml
deleted file mode 100644
index eb62f7ac..00000000
--- a/extensions/molecule/service_cluster/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_cluster (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_cluster as check-mode baseline (prerequisite for check)
-      ansible.platform.service_cluster:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/deleted/converge.yml b/extensions/molecule/service_cluster/deleted/converge.yml
deleted file mode 100644
index 4571c87e..00000000
--- a/extensions/molecule/service_cluster/deleted/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_cluster (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=deleted
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_cluster/deleted/prepare.yml b/extensions/molecule/service_cluster/deleted/prepare.yml
deleted file mode 100644
index 8c80de29..00000000
--- a/extensions/molecule/service_cluster/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_cluster (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_cluster to be deleted (prerequisite for deleted)
-      ansible.platform.service_cluster:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/gathered/converge.yml b/extensions/molecule/service_cluster/gathered/converge.yml
deleted file mode 100644
index 1933e80e..00000000
--- a/extensions/molecule/service_cluster/gathered/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_cluster (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=gathered
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_cluster/gathered/prepare.yml b/extensions/molecule/service_cluster/gathered/prepare.yml
deleted file mode 100644
index b3fda93b..00000000
--- a/extensions/molecule/service_cluster/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_cluster (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_cluster to be gathered (prerequisite for gathered)
-      ansible.platform.service_cluster:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/gathered/verify.yml b/extensions/molecule/service_cluster/gathered/verify.yml
deleted file mode 100644
index 9323c409..00000000
--- a/extensions/molecule/service_cluster/gathered/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_cluster (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_cluster (assert present after gathered)
-      ansible.platform.service_cluster:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after gathered
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_cluster/merged/converge.yml b/extensions/molecule/service_cluster/merged/converge.yml
deleted file mode 100644
index 04cf3efd..00000000
--- a/extensions/molecule/service_cluster/merged/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_cluster (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=merged
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_cluster/merged/verify.yml b/extensions/molecule/service_cluster/merged/verify.yml
deleted file mode 100644
index 0217c1b3..00000000
--- a/extensions/molecule/service_cluster/merged/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_cluster (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_cluster (assert present after merged)
-      ansible.platform.service_cluster:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after merged
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_cluster/overridden/converge.yml b/extensions/molecule/service_cluster/overridden/converge.yml
deleted file mode 100644
index 3d34a962..00000000
--- a/extensions/molecule/service_cluster/overridden/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_cluster (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=overridden
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: overridden
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_cluster/overridden/prepare.yml b/extensions/molecule/service_cluster/overridden/prepare.yml
deleted file mode 100644
index 0c3c75ee..00000000
--- a/extensions/molecule/service_cluster/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — service_cluster (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.service_cluster:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/replaced/cleanup.yml b/extensions/molecule/service_cluster/replaced/cleanup.yml
deleted file mode 100644
index bab16ade..00000000
--- a/extensions/molecule/service_cluster/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — service_cluster (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-cluster-alpha (test teardown)
-      ansible.platform.service_cluster:
-        config:
-          - name: "int-cluster-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/service_cluster/replaced/converge.yml b/extensions/molecule/service_cluster/replaced/converge.yml
deleted file mode 100644
index 8535e1a1..00000000
--- a/extensions/molecule/service_cluster/replaced/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_cluster (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_cluster with state=replaced
-      ansible.platform.service_cluster:
-        config:
-          - "{{ expected_config }}"
-        state: replaced
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_cluster/replaced/prepare.yml b/extensions/molecule/service_cluster/replaced/prepare.yml
deleted file mode 100644
index 4d417bca..00000000
--- a/extensions/molecule/service_cluster/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_cluster (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_cluster to be replaced (prerequisite for replaced)
-      ansible.platform.service_cluster:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_cluster/check/cleanup.yml b/extensions/molecule/service_clusters/check/cleanup.yml
similarity index 83%
rename from extensions/molecule/service_cluster/check/cleanup.yml
rename to extensions/molecule/service_clusters/check/cleanup.yml
index f2bb7f3d..2830446e 100644
--- a/extensions/molecule/service_cluster/check/cleanup.yml
+++ b/extensions/molecule/service_clusters/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_cluster (check)"
+- name: "Cleanup — service_clusters (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cluster-alpha (test teardown)
-      ansible.platform.service_cluster:
+      ansible.platform.service_clusters:
         config:
           - name: "int-cluster-alpha"
         state: deleted
diff --git a/extensions/molecule/service_clusters/check/converge.yml b/extensions/molecule/service_clusters/check/converge.yml
new file mode 100644
index 00000000..649dc340
--- /dev/null
+++ b/extensions/molecule/service_clusters/check/converge.yml
@@ -0,0 +1,36 @@
+---
+- name: "Converge — service_clusters (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=merged
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      check_mode: true
+      diff: true
+      register: result
+
+    - name: Assert check mode predicted a change
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.before is defined
+          - result.after is defined
+        fail_msg: "check mode should predict a change. got={{ result }}"
+
+    - name: Assert diff output is present
+      ansible.builtin.assert:
+        that:
+          - result.diff is defined
+        fail_msg: "diff output missing from check result"
+      when: result.diff is defined
+
+...
diff --git a/extensions/molecule/service/check/molecule.yml b/extensions/molecule/service_clusters/check/molecule.yml
similarity index 100%
rename from extensions/molecule/service/check/molecule.yml
rename to extensions/molecule/service_clusters/check/molecule.yml
diff --git a/extensions/molecule/service_clusters/check/prepare.yml b/extensions/molecule/service_clusters/check/prepare.yml
new file mode 100644
index 00000000..9228d250
--- /dev/null
+++ b/extensions/molecule/service_clusters/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_clusters (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_clusters as check-mode baseline (prerequisite for check)
+      ansible.platform.service_clusters:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_cluster/check/vars.yml b/extensions/molecule/service_clusters/check/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/check/vars.yml
rename to extensions/molecule/service_clusters/check/vars.yml
diff --git a/extensions/molecule/service_cluster/check/verify.yml b/extensions/molecule/service_clusters/check/verify.yml
similarity index 83%
rename from extensions/molecule/service_cluster/check/verify.yml
rename to extensions/molecule/service_clusters/check/verify.yml
index e09a579b..a3473e00 100644
--- a/extensions/molecule/service_cluster/check/verify.yml
+++ b/extensions/molecule/service_clusters/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_cluster (check)"
+- name: "Verify — service_clusters (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_cluster (check mode must not have applied changes)
-      ansible.platform.service_cluster:
+    - name: Gather service_clusters (check mode must not have applied changes)
+      ansible.platform.service_clusters:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_cluster/deleted/cleanup.yml b/extensions/molecule/service_clusters/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_cluster/deleted/cleanup.yml
rename to extensions/molecule/service_clusters/deleted/cleanup.yml
index 774f1f20..3e15dcdb 100644
--- a/extensions/molecule/service_cluster/deleted/cleanup.yml
+++ b/extensions/molecule/service_clusters/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — service_cluster (deleted)"
+- name: "Cleanup — service_clusters (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/service_clusters/deleted/converge.yml b/extensions/molecule/service_clusters/deleted/converge.yml
new file mode 100644
index 00000000..0ebaf8a8
--- /dev/null
+++ b/extensions/molecule/service_clusters/deleted/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_clusters (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=deleted
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service/deleted/molecule.yml b/extensions/molecule/service_clusters/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/service/deleted/molecule.yml
rename to extensions/molecule/service_clusters/deleted/molecule.yml
diff --git a/extensions/molecule/service_clusters/deleted/prepare.yml b/extensions/molecule/service_clusters/deleted/prepare.yml
new file mode 100644
index 00000000..68a9f310
--- /dev/null
+++ b/extensions/molecule/service_clusters/deleted/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_clusters (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_clusters to be deleted (prerequisite for deleted)
+      ansible.platform.service_clusters:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_cluster/deleted/vars.yml b/extensions/molecule/service_clusters/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/deleted/vars.yml
rename to extensions/molecule/service_clusters/deleted/vars.yml
diff --git a/extensions/molecule/service_cluster/deleted/verify.yml b/extensions/molecule/service_clusters/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/service_cluster/deleted/verify.yml
rename to extensions/molecule/service_clusters/deleted/verify.yml
index a1fbeb4b..bcb61acb 100644
--- a/extensions/molecule/service_cluster/deleted/verify.yml
+++ b/extensions/molecule/service_clusters/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_cluster (deleted)"
+- name: "Verify — service_clusters (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_cluster (should be absent after deleted)
-      ansible.platform.service_cluster:
+    - name: Gather service_clusters (should be absent after deleted)
+      ansible.platform.service_clusters:
         config:
           - name: "int-cluster-alpha"
         state: gathered
diff --git a/extensions/molecule/service_cluster/merged/cleanup.yml b/extensions/molecule/service_clusters/gathered/cleanup.yml
similarity index 83%
rename from extensions/molecule/service_cluster/merged/cleanup.yml
rename to extensions/molecule/service_clusters/gathered/cleanup.yml
index e61ad23d..48a3c0e4 100644
--- a/extensions/molecule/service_cluster/merged/cleanup.yml
+++ b/extensions/molecule/service_clusters/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_cluster (merged)"
+- name: "Cleanup — service_clusters (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cluster-alpha (test teardown)
-      ansible.platform.service_cluster:
+      ansible.platform.service_clusters:
         config:
           - name: "int-cluster-alpha"
         state: deleted
diff --git a/extensions/molecule/service_clusters/gathered/converge.yml b/extensions/molecule/service_clusters/gathered/converge.yml
new file mode 100644
index 00000000..11cced2f
--- /dev/null
+++ b/extensions/molecule/service_clusters/gathered/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_clusters (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=gathered
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service/gathered/molecule.yml b/extensions/molecule/service_clusters/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/service/gathered/molecule.yml
rename to extensions/molecule/service_clusters/gathered/molecule.yml
diff --git a/extensions/molecule/service_clusters/gathered/prepare.yml b/extensions/molecule/service_clusters/gathered/prepare.yml
new file mode 100644
index 00000000..9d4b4e05
--- /dev/null
+++ b/extensions/molecule/service_clusters/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_clusters (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_clusters to be gathered (prerequisite for gathered)
+      ansible.platform.service_clusters:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_cluster/gathered/vars.yml b/extensions/molecule/service_clusters/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/gathered/vars.yml
rename to extensions/molecule/service_clusters/gathered/vars.yml
diff --git a/extensions/molecule/service_clusters/gathered/verify.yml b/extensions/molecule/service_clusters/gathered/verify.yml
new file mode 100644
index 00000000..ac944e20
--- /dev/null
+++ b/extensions/molecule/service_clusters/gathered/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_clusters (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_clusters (assert present after gathered)
+      ansible.platform.service_clusters:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after gathered
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service/inventory.yml b/extensions/molecule/service_clusters/inventory.yml
similarity index 100%
rename from extensions/molecule/service/inventory.yml
rename to extensions/molecule/service_clusters/inventory.yml
diff --git a/extensions/molecule/service_cluster/gathered/cleanup.yml b/extensions/molecule/service_clusters/merged/cleanup.yml
similarity index 83%
rename from extensions/molecule/service_cluster/gathered/cleanup.yml
rename to extensions/molecule/service_clusters/merged/cleanup.yml
index ef7cde00..b2f38352 100644
--- a/extensions/molecule/service_cluster/gathered/cleanup.yml
+++ b/extensions/molecule/service_clusters/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_cluster (gathered)"
+- name: "Cleanup — service_clusters (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cluster-alpha (test teardown)
-      ansible.platform.service_cluster:
+      ansible.platform.service_clusters:
         config:
           - name: "int-cluster-alpha"
         state: deleted
diff --git a/extensions/molecule/service_clusters/merged/converge.yml b/extensions/molecule/service_clusters/merged/converge.yml
new file mode 100644
index 00000000..a21df754
--- /dev/null
+++ b/extensions/molecule/service_clusters/merged/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_clusters (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=merged
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service/merged/molecule.yml b/extensions/molecule/service_clusters/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/service/merged/molecule.yml
rename to extensions/molecule/service_clusters/merged/molecule.yml
diff --git a/extensions/molecule/service_cluster/merged/vars.yml b/extensions/molecule/service_clusters/merged/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/merged/vars.yml
rename to extensions/molecule/service_clusters/merged/vars.yml
diff --git a/extensions/molecule/service_clusters/merged/verify.yml b/extensions/molecule/service_clusters/merged/verify.yml
new file mode 100644
index 00000000..19f8db6a
--- /dev/null
+++ b/extensions/molecule/service_clusters/merged/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_clusters (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_clusters (assert present after merged)
+      ansible.platform.service_clusters:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after merged
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service_clusters/overridden/cleanup.yml b/extensions/molecule/service_clusters/overridden/cleanup.yml
new file mode 100644
index 00000000..d6322f40
--- /dev/null
+++ b/extensions/molecule/service_clusters/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — service_clusters (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-cluster-alpha (test teardown)
+      ansible.platform.service_clusters:
+        config:
+          - name: "int-cluster-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/service_clusters/overridden/converge.yml b/extensions/molecule/service_clusters/overridden/converge.yml
new file mode 100644
index 00000000..21f8e3f3
--- /dev/null
+++ b/extensions/molecule/service_clusters/overridden/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_clusters (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=overridden
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: overridden
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service/overridden/molecule.yml b/extensions/molecule/service_clusters/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/service/overridden/molecule.yml
rename to extensions/molecule/service_clusters/overridden/molecule.yml
diff --git a/extensions/molecule/service_clusters/overridden/prepare.yml b/extensions/molecule/service_clusters/overridden/prepare.yml
new file mode 100644
index 00000000..0436785b
--- /dev/null
+++ b/extensions/molecule/service_clusters/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — service_clusters (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.service_clusters:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_cluster/overridden/vars.yml b/extensions/molecule/service_clusters/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/overridden/vars.yml
rename to extensions/molecule/service_clusters/overridden/vars.yml
diff --git a/extensions/molecule/service_cluster/overridden/verify.yml b/extensions/molecule/service_clusters/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/service_cluster/overridden/verify.yml
rename to extensions/molecule/service_clusters/overridden/verify.yml
index e8f378ee..52fe7deb 100644
--- a/extensions/molecule/service_cluster/overridden/verify.yml
+++ b/extensions/molecule/service_clusters/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_cluster (overridden)"
+- name: "Verify — service_clusters (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all service_cluster resources (verify overridden final state)
-      ansible.platform.service_cluster:
+    - name: Gather all service_clusters resources (verify overridden final state)
+      ansible.platform.service_clusters:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/service_cluster/overridden/cleanup.yml b/extensions/molecule/service_clusters/replaced/cleanup.yml
similarity index 83%
rename from extensions/molecule/service_cluster/overridden/cleanup.yml
rename to extensions/molecule/service_clusters/replaced/cleanup.yml
index 97c2373e..3bf7ffd7 100644
--- a/extensions/molecule/service_cluster/overridden/cleanup.yml
+++ b/extensions/molecule/service_clusters/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_cluster (overridden)"
+- name: "Cleanup — service_clusters (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-cluster-alpha (test teardown)
-      ansible.platform.service_cluster:
+      ansible.platform.service_clusters:
         config:
           - name: "int-cluster-alpha"
         state: deleted
diff --git a/extensions/molecule/service_clusters/replaced/converge.yml b/extensions/molecule/service_clusters/replaced/converge.yml
new file mode 100644
index 00000000..19850b5e
--- /dev/null
+++ b/extensions/molecule/service_clusters/replaced/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_clusters (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_clusters with state=replaced
+      ansible.platform.service_clusters:
+        config:
+          - "{{ expected_config }}"
+        state: replaced
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service/replaced/molecule.yml b/extensions/molecule/service_clusters/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/service/replaced/molecule.yml
rename to extensions/molecule/service_clusters/replaced/molecule.yml
diff --git a/extensions/molecule/service_clusters/replaced/prepare.yml b/extensions/molecule/service_clusters/replaced/prepare.yml
new file mode 100644
index 00000000..ebbad5b4
--- /dev/null
+++ b/extensions/molecule/service_clusters/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_clusters (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_clusters to be replaced (prerequisite for replaced)
+      ansible.platform.service_clusters:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_cluster/replaced/vars.yml b/extensions/molecule/service_clusters/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/service_cluster/replaced/vars.yml
rename to extensions/molecule/service_clusters/replaced/vars.yml
diff --git a/extensions/molecule/service_cluster/replaced/verify.yml b/extensions/molecule/service_clusters/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/service_cluster/replaced/verify.yml
rename to extensions/molecule/service_clusters/replaced/verify.yml
index 691f3e7d..3307f618 100644
--- a/extensions/molecule/service_cluster/replaced/verify.yml
+++ b/extensions/molecule/service_clusters/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_cluster (replaced)"
+- name: "Verify — service_clusters (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_cluster (assert present after replaced)
-      ansible.platform.service_cluster:
+    - name: Gather service_clusters (assert present after replaced)
+      ansible.platform.service_clusters:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_key/check/converge.yml b/extensions/molecule/service_key/check/converge.yml
deleted file mode 100644
index 458678be..00000000
--- a/extensions/molecule/service_key/check/converge.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: "Converge — service_key (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=merged
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      check_mode: true
-      diff: true
-      register: result
-
-    - name: Assert check mode predicted a change
-      ansible.builtin.assert:
-        that:
-          - result.changed == true
-          - result.before is defined
-          - result.after is defined
-        fail_msg: "check mode should predict a change. got={{ result }}"
-
-    - name: Assert diff output is present
-      ansible.builtin.assert:
-        that:
-          - result.diff is defined
-        fail_msg: "diff output missing from check result"
-      when: result.diff is defined
-
-...
diff --git a/extensions/molecule/service_key/check/prepare.yml b/extensions/molecule/service_key/check/prepare.yml
deleted file mode 100644
index fd19bb5a..00000000
--- a/extensions/molecule/service_key/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_key (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_key as check-mode baseline (prerequisite for check)
-      ansible.platform.service_key:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_key/deleted/converge.yml b/extensions/molecule/service_key/deleted/converge.yml
deleted file mode 100644
index b4ce005e..00000000
--- a/extensions/molecule/service_key/deleted/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_key (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=deleted
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_key/deleted/prepare.yml b/extensions/molecule/service_key/deleted/prepare.yml
deleted file mode 100644
index 1251ec80..00000000
--- a/extensions/molecule/service_key/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_key (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_key to be deleted (prerequisite for deleted)
-      ansible.platform.service_key:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_key/gathered/converge.yml b/extensions/molecule/service_key/gathered/converge.yml
deleted file mode 100644
index 1f7ac393..00000000
--- a/extensions/molecule/service_key/gathered/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_key (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=gathered
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_key/gathered/prepare.yml b/extensions/molecule/service_key/gathered/prepare.yml
deleted file mode 100644
index 12322968..00000000
--- a/extensions/molecule/service_key/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_key (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_key to be gathered (prerequisite for gathered)
-      ansible.platform.service_key:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_key/gathered/verify.yml b/extensions/molecule/service_key/gathered/verify.yml
deleted file mode 100644
index 7f9f0125..00000000
--- a/extensions/molecule/service_key/gathered/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_key (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_key (assert present after gathered)
-      ansible.platform.service_key:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after gathered
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_key/merged/converge.yml b/extensions/molecule/service_key/merged/converge.yml
deleted file mode 100644
index 082a4ecc..00000000
--- a/extensions/molecule/service_key/merged/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_key (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=merged
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_key/merged/verify.yml b/extensions/molecule/service_key/merged/verify.yml
deleted file mode 100644
index b271ad97..00000000
--- a/extensions/molecule/service_key/merged/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_key (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_key (assert present after merged)
-      ansible.platform.service_key:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after merged
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_key/overridden/converge.yml b/extensions/molecule/service_key/overridden/converge.yml
deleted file mode 100644
index 14fd9797..00000000
--- a/extensions/molecule/service_key/overridden/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_key (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=overridden
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: overridden
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_key/overridden/prepare.yml b/extensions/molecule/service_key/overridden/prepare.yml
deleted file mode 100644
index 345783b0..00000000
--- a/extensions/molecule/service_key/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — service_key (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.service_key:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_key/replaced/cleanup.yml b/extensions/molecule/service_key/replaced/cleanup.yml
deleted file mode 100644
index b15d6e1f..00000000
--- a/extensions/molecule/service_key/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — service_key (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-skey-alpha (test teardown)
-      ansible.platform.service_key:
-        config:
-          - name: "int-skey-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/service_key/replaced/converge.yml b/extensions/molecule/service_key/replaced/converge.yml
deleted file mode 100644
index bda45ec4..00000000
--- a/extensions/molecule/service_key/replaced/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_key (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_key with state=replaced
-      ansible.platform.service_key:
-        config:
-          - "{{ expected_config }}"
-        state: replaced
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_key/replaced/prepare.yml b/extensions/molecule/service_key/replaced/prepare.yml
deleted file mode 100644
index 00e64d4e..00000000
--- a/extensions/molecule/service_key/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_key (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_key to be replaced (prerequisite for replaced)
-      ansible.platform.service_key:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_key/check/cleanup.yml b/extensions/molecule/service_keys/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_key/check/cleanup.yml
rename to extensions/molecule/service_keys/check/cleanup.yml
index 78cc2d5c..608ee26c 100644
--- a/extensions/molecule/service_key/check/cleanup.yml
+++ b/extensions/molecule/service_keys/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_key (check)"
+- name: "Cleanup — service_keys (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-skey-alpha (test teardown)
-      ansible.platform.service_key:
+      ansible.platform.service_keys:
         config:
           - name: "int-skey-alpha"
         state: deleted
diff --git a/extensions/molecule/application/check/converge.yml b/extensions/molecule/service_keys/check/converge.yml
similarity index 86%
rename from extensions/molecule/application/check/converge.yml
rename to extensions/molecule/service_keys/check/converge.yml
index c405362d..e1a13638 100644
--- a/extensions/molecule/application/check/converge.yml
+++ b/extensions/molecule/service_keys/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (check)"
+- name: "Converge — service_keys (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=merged
-      ansible.platform.application:
+    - name: Run ansible.platform.service_keys with state=merged
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/service_cluster/check/molecule.yml b/extensions/molecule/service_keys/check/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/check/molecule.yml
rename to extensions/molecule/service_keys/check/molecule.yml
diff --git a/extensions/molecule/service_node/check/prepare.yml b/extensions/molecule/service_keys/check/prepare.yml
similarity index 73%
rename from extensions/molecule/service_node/check/prepare.yml
rename to extensions/molecule/service_keys/check/prepare.yml
index 9c66a145..96a8e88d 100644
--- a/extensions/molecule/service_node/check/prepare.yml
+++ b/extensions/molecule/service_keys/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — service_node (check)"
+- name: "Prepare — service_keys (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed service_node as check-mode baseline (prerequisite for check)
-      ansible.platform.service_node:
+    - name: Seed service_keys as check-mode baseline (prerequisite for check)
+      ansible.platform.service_keys:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_key/check/vars.yml b/extensions/molecule/service_keys/check/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/check/vars.yml
rename to extensions/molecule/service_keys/check/vars.yml
diff --git a/extensions/molecule/service_key/check/verify.yml b/extensions/molecule/service_keys/check/verify.yml
similarity index 83%
rename from extensions/molecule/service_key/check/verify.yml
rename to extensions/molecule/service_keys/check/verify.yml
index 0db240bb..9d5ae239 100644
--- a/extensions/molecule/service_key/check/verify.yml
+++ b/extensions/molecule/service_keys/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_key (check)"
+- name: "Verify — service_keys (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_key (check mode must not have applied changes)
-      ansible.platform.service_key:
+    - name: Gather service_keys (check mode must not have applied changes)
+      ansible.platform.service_keys:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_key/deleted/cleanup.yml b/extensions/molecule/service_keys/deleted/cleanup.yml
similarity index 85%
rename from extensions/molecule/service_key/deleted/cleanup.yml
rename to extensions/molecule/service_keys/deleted/cleanup.yml
index 5d6ec6cf..11948ae1 100644
--- a/extensions/molecule/service_key/deleted/cleanup.yml
+++ b/extensions/molecule/service_keys/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — service_key (deleted)"
+- name: "Cleanup — service_keys (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/service_type/deleted/converge.yml b/extensions/molecule/service_keys/deleted/converge.yml
similarity index 73%
rename from extensions/molecule/service_type/deleted/converge.yml
rename to extensions/molecule/service_keys/deleted/converge.yml
index ad266364..44968a79 100644
--- a/extensions/molecule/service_type/deleted/converge.yml
+++ b/extensions/molecule/service_keys/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_type (deleted)"
+- name: "Converge — service_keys (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_type with state=deleted
-      ansible.platform.service_type:
+    - name: Run ansible.platform.service_keys with state=deleted
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/service_cluster/deleted/molecule.yml b/extensions/molecule/service_keys/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/deleted/molecule.yml
rename to extensions/molecule/service_keys/deleted/molecule.yml
diff --git a/extensions/molecule/service_node/deleted/prepare.yml b/extensions/molecule/service_keys/deleted/prepare.yml
similarity index 72%
rename from extensions/molecule/service_node/deleted/prepare.yml
rename to extensions/molecule/service_keys/deleted/prepare.yml
index 33aa48ff..a8da72e2 100644
--- a/extensions/molecule/service_node/deleted/prepare.yml
+++ b/extensions/molecule/service_keys/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — service_node (deleted)"
+- name: "Prepare — service_keys (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed service_node to be deleted (prerequisite for deleted)
-      ansible.platform.service_node:
+    - name: Seed service_keys to be deleted (prerequisite for deleted)
+      ansible.platform.service_keys:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_key/deleted/vars.yml b/extensions/molecule/service_keys/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/deleted/vars.yml
rename to extensions/molecule/service_keys/deleted/vars.yml
diff --git a/extensions/molecule/service_key/deleted/verify.yml b/extensions/molecule/service_keys/deleted/verify.yml
similarity index 82%
rename from extensions/molecule/service_key/deleted/verify.yml
rename to extensions/molecule/service_keys/deleted/verify.yml
index 5dfd8dd9..c231a453 100644
--- a/extensions/molecule/service_key/deleted/verify.yml
+++ b/extensions/molecule/service_keys/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_key (deleted)"
+- name: "Verify — service_keys (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_key (should be absent after deleted)
-      ansible.platform.service_key:
+    - name: Gather service_keys (should be absent after deleted)
+      ansible.platform.service_keys:
         config:
           - name: "int-skey-alpha"
         state: gathered
diff --git a/extensions/molecule/service_key/merged/cleanup.yml b/extensions/molecule/service_keys/gathered/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_key/merged/cleanup.yml
rename to extensions/molecule/service_keys/gathered/cleanup.yml
index 76e85164..e4eaab8a 100644
--- a/extensions/molecule/service_key/merged/cleanup.yml
+++ b/extensions/molecule/service_keys/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_key (merged)"
+- name: "Cleanup — service_keys (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-skey-alpha (test teardown)
-      ansible.platform.service_key:
+      ansible.platform.service_keys:
         config:
           - name: "int-skey-alpha"
         state: deleted
diff --git a/extensions/molecule/organization/gathered/converge.yml b/extensions/molecule/service_keys/gathered/converge.yml
similarity index 73%
rename from extensions/molecule/organization/gathered/converge.yml
rename to extensions/molecule/service_keys/gathered/converge.yml
index 85552480..079379b6 100644
--- a/extensions/molecule/organization/gathered/converge.yml
+++ b/extensions/molecule/service_keys/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (gathered)"
+- name: "Converge — service_keys (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=gathered
-      ansible.platform.organization:
+    - name: Run ansible.platform.service_keys with state=gathered
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/service_cluster/gathered/molecule.yml b/extensions/molecule/service_keys/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/gathered/molecule.yml
rename to extensions/molecule/service_keys/gathered/molecule.yml
diff --git a/extensions/molecule/service_node/gathered/prepare.yml b/extensions/molecule/service_keys/gathered/prepare.yml
similarity index 72%
rename from extensions/molecule/service_node/gathered/prepare.yml
rename to extensions/molecule/service_keys/gathered/prepare.yml
index d24d2576..7ad98077 100644
--- a/extensions/molecule/service_node/gathered/prepare.yml
+++ b/extensions/molecule/service_keys/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — service_node (gathered)"
+- name: "Prepare — service_keys (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed service_node to be gathered (prerequisite for gathered)
-      ansible.platform.service_node:
+    - name: Seed service_keys to be gathered (prerequisite for gathered)
+      ansible.platform.service_keys:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_key/gathered/vars.yml b/extensions/molecule/service_keys/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/gathered/vars.yml
rename to extensions/molecule/service_keys/gathered/vars.yml
diff --git a/extensions/molecule/application/gathered/verify.yml b/extensions/molecule/service_keys/gathered/verify.yml
similarity index 82%
rename from extensions/molecule/application/gathered/verify.yml
rename to extensions/molecule/service_keys/gathered/verify.yml
index 4f2bad1b..27fe0e3e 100644
--- a/extensions/molecule/application/gathered/verify.yml
+++ b/extensions/molecule/service_keys/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — application (gathered)"
+- name: "Verify — service_keys (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather application (assert present after gathered)
-      ansible.platform.application:
+    - name: Gather service_keys (assert present after gathered)
+      ansible.platform.service_keys:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_cluster/inventory.yml b/extensions/molecule/service_keys/inventory.yml
similarity index 100%
rename from extensions/molecule/service_cluster/inventory.yml
rename to extensions/molecule/service_keys/inventory.yml
diff --git a/extensions/molecule/service_key/gathered/cleanup.yml b/extensions/molecule/service_keys/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_key/gathered/cleanup.yml
rename to extensions/molecule/service_keys/merged/cleanup.yml
index a87c7be1..05ecebbb 100644
--- a/extensions/molecule/service_key/gathered/cleanup.yml
+++ b/extensions/molecule/service_keys/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_key (gathered)"
+- name: "Cleanup — service_keys (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-skey-alpha (test teardown)
-      ansible.platform.service_key:
+      ansible.platform.service_keys:
         config:
           - name: "int-skey-alpha"
         state: deleted
diff --git a/extensions/molecule/organization/merged/converge.yml b/extensions/molecule/service_keys/merged/converge.yml
similarity index 73%
rename from extensions/molecule/organization/merged/converge.yml
rename to extensions/molecule/service_keys/merged/converge.yml
index 51c23da5..74523c23 100644
--- a/extensions/molecule/organization/merged/converge.yml
+++ b/extensions/molecule/service_keys/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (merged)"
+- name: "Converge — service_keys (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=merged
-      ansible.platform.organization:
+    - name: Run ansible.platform.service_keys with state=merged
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/service_cluster/merged/molecule.yml b/extensions/molecule/service_keys/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/merged/molecule.yml
rename to extensions/molecule/service_keys/merged/molecule.yml
diff --git a/extensions/molecule/service_key/merged/vars.yml b/extensions/molecule/service_keys/merged/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/merged/vars.yml
rename to extensions/molecule/service_keys/merged/vars.yml
diff --git a/extensions/molecule/organization/merged/verify.yml b/extensions/molecule/service_keys/merged/verify.yml
similarity index 82%
rename from extensions/molecule/organization/merged/verify.yml
rename to extensions/molecule/service_keys/merged/verify.yml
index 44ea2d97..e81964fe 100644
--- a/extensions/molecule/organization/merged/verify.yml
+++ b/extensions/molecule/service_keys/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — organization (merged)"
+- name: "Verify — service_keys (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather organization (assert present after merged)
-      ansible.platform.organization:
+    - name: Gather service_keys (assert present after merged)
+      ansible.platform.service_keys:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_keys/overridden/cleanup.yml b/extensions/molecule/service_keys/overridden/cleanup.yml
new file mode 100644
index 00000000..b4083e3f
--- /dev/null
+++ b/extensions/molecule/service_keys/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — service_keys (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-skey-alpha (test teardown)
+      ansible.platform.service_keys:
+        config:
+          - name: "int-skey-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/service_type/overridden/converge.yml b/extensions/molecule/service_keys/overridden/converge.yml
similarity index 73%
rename from extensions/molecule/service_type/overridden/converge.yml
rename to extensions/molecule/service_keys/overridden/converge.yml
index f6796a5d..7c31640c 100644
--- a/extensions/molecule/service_type/overridden/converge.yml
+++ b/extensions/molecule/service_keys/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_type (overridden)"
+- name: "Converge — service_keys (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_type with state=overridden
-      ansible.platform.service_type:
+    - name: Run ansible.platform.service_keys with state=overridden
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/service_cluster/overridden/molecule.yml b/extensions/molecule/service_keys/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/overridden/molecule.yml
rename to extensions/molecule/service_keys/overridden/molecule.yml
diff --git a/extensions/molecule/organization/overridden/prepare.yml b/extensions/molecule/service_keys/overridden/prepare.yml
similarity index 84%
rename from extensions/molecule/organization/overridden/prepare.yml
rename to extensions/molecule/service_keys/overridden/prepare.yml
index 219d288b..86c46ff6 100644
--- a/extensions/molecule/organization/overridden/prepare.yml
+++ b/extensions/molecule/service_keys/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — organization (overridden)"
+- name: "Prepare — service_keys (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.organization:
+      ansible.platform.service_keys:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/service_key/overridden/vars.yml b/extensions/molecule/service_keys/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/overridden/vars.yml
rename to extensions/molecule/service_keys/overridden/vars.yml
diff --git a/extensions/molecule/service_key/overridden/verify.yml b/extensions/molecule/service_keys/overridden/verify.yml
similarity index 87%
rename from extensions/molecule/service_key/overridden/verify.yml
rename to extensions/molecule/service_keys/overridden/verify.yml
index 66439bc4..7b4a0576 100644
--- a/extensions/molecule/service_key/overridden/verify.yml
+++ b/extensions/molecule/service_keys/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_key (overridden)"
+- name: "Verify — service_keys (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all service_key resources (verify overridden final state)
-      ansible.platform.service_key:
+    - name: Gather all service_keys resources (verify overridden final state)
+      ansible.platform.service_keys:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/service_key/overridden/cleanup.yml b/extensions/molecule/service_keys/replaced/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_key/overridden/cleanup.yml
rename to extensions/molecule/service_keys/replaced/cleanup.yml
index dafc0c7e..8b480891 100644
--- a/extensions/molecule/service_key/overridden/cleanup.yml
+++ b/extensions/molecule/service_keys/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_key (overridden)"
+- name: "Cleanup — service_keys (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-skey-alpha (test teardown)
-      ansible.platform.service_key:
+      ansible.platform.service_keys:
         config:
           - name: "int-skey-alpha"
         state: deleted
diff --git a/extensions/molecule/service_node/replaced/converge.yml b/extensions/molecule/service_keys/replaced/converge.yml
similarity index 73%
rename from extensions/molecule/service_node/replaced/converge.yml
rename to extensions/molecule/service_keys/replaced/converge.yml
index a9e977d0..72348c78 100644
--- a/extensions/molecule/service_node/replaced/converge.yml
+++ b/extensions/molecule/service_keys/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service_node (replaced)"
+- name: "Converge — service_keys (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service_node with state=replaced
-      ansible.platform.service_node:
+    - name: Run ansible.platform.service_keys with state=replaced
+      ansible.platform.service_keys:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/service_cluster/replaced/molecule.yml b/extensions/molecule/service_keys/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/service_cluster/replaced/molecule.yml
rename to extensions/molecule/service_keys/replaced/molecule.yml
diff --git a/extensions/molecule/service_node/replaced/prepare.yml b/extensions/molecule/service_keys/replaced/prepare.yml
similarity index 72%
rename from extensions/molecule/service_node/replaced/prepare.yml
rename to extensions/molecule/service_keys/replaced/prepare.yml
index be2c5641..895715b4 100644
--- a/extensions/molecule/service_node/replaced/prepare.yml
+++ b/extensions/molecule/service_keys/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — service_node (replaced)"
+- name: "Prepare — service_keys (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed service_node to be replaced (prerequisite for replaced)
-      ansible.platform.service_node:
+    - name: Seed service_keys to be replaced (prerequisite for replaced)
+      ansible.platform.service_keys:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_key/replaced/vars.yml b/extensions/molecule/service_keys/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/service_key/replaced/vars.yml
rename to extensions/molecule/service_keys/replaced/vars.yml
diff --git a/extensions/molecule/service_key/replaced/verify.yml b/extensions/molecule/service_keys/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/service_key/replaced/verify.yml
rename to extensions/molecule/service_keys/replaced/verify.yml
index c95cd0e5..48fdf77f 100644
--- a/extensions/molecule/service_key/replaced/verify.yml
+++ b/extensions/molecule/service_keys/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_key (replaced)"
+- name: "Verify — service_keys (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_key (assert present after replaced)
-      ansible.platform.service_key:
+    - name: Gather service_keys (assert present after replaced)
+      ansible.platform.service_keys:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_node/check/converge.yml b/extensions/molecule/service_node/check/converge.yml
deleted file mode 100644
index 0c37ae7e..00000000
--- a/extensions/molecule/service_node/check/converge.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: "Converge — service_node (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_node with state=merged
-      ansible.platform.service_node:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      check_mode: true
-      diff: true
-      register: result
-
-    - name: Assert check mode predicted a change
-      ansible.builtin.assert:
-        that:
-          - result.changed == true
-          - result.before is defined
-          - result.after is defined
-        fail_msg: "check mode should predict a change. got={{ result }}"
-
-    - name: Assert diff output is present
-      ansible.builtin.assert:
-        that:
-          - result.diff is defined
-        fail_msg: "diff output missing from check result"
-      when: result.diff is defined
-
-...
diff --git a/extensions/molecule/service_node/gathered/verify.yml b/extensions/molecule/service_node/gathered/verify.yml
deleted file mode 100644
index ca0b3e38..00000000
--- a/extensions/molecule/service_node/gathered/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_node (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_node (assert present after gathered)
-      ansible.platform.service_node:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after gathered
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_node/merged/converge.yml b/extensions/molecule/service_node/merged/converge.yml
deleted file mode 100644
index dfda94be..00000000
--- a/extensions/molecule/service_node/merged/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_node (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_node with state=merged
-      ansible.platform.service_node:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_node/merged/verify.yml b/extensions/molecule/service_node/merged/verify.yml
deleted file mode 100644
index 2a6d785b..00000000
--- a/extensions/molecule/service_node/merged/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_node (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_node (assert present after merged)
-      ansible.platform.service_node:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after merged
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_node/overridden/prepare.yml b/extensions/molecule/service_node/overridden/prepare.yml
deleted file mode 100644
index 16442200..00000000
--- a/extensions/molecule/service_node/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — service_node (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.service_node:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_node/replaced/cleanup.yml b/extensions/molecule/service_node/replaced/cleanup.yml
deleted file mode 100644
index eab89983..00000000
--- a/extensions/molecule/service_node/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — service_node (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-snode-alpha (test teardown)
-      ansible.platform.service_node:
-        config:
-          - name: "int-snode-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/service_node/check/cleanup.yml b/extensions/molecule/service_nodes/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_node/check/cleanup.yml
rename to extensions/molecule/service_nodes/check/cleanup.yml
index 55203bd0..14b8ff91 100644
--- a/extensions/molecule/service_node/check/cleanup.yml
+++ b/extensions/molecule/service_nodes/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_node (check)"
+- name: "Cleanup — service_nodes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-snode-alpha (test teardown)
-      ansible.platform.service_node:
+      ansible.platform.service_nodes:
         config:
           - name: "int-snode-alpha"
         state: deleted
diff --git a/extensions/molecule/service_nodes/check/converge.yml b/extensions/molecule/service_nodes/check/converge.yml
new file mode 100644
index 00000000..c2c4f7a0
--- /dev/null
+++ b/extensions/molecule/service_nodes/check/converge.yml
@@ -0,0 +1,36 @@
+---
+- name: "Converge — service_nodes (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_nodes with state=merged
+      ansible.platform.service_nodes:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      check_mode: true
+      diff: true
+      register: result
+
+    - name: Assert check mode predicted a change
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.before is defined
+          - result.after is defined
+        fail_msg: "check mode should predict a change. got={{ result }}"
+
+    - name: Assert diff output is present
+      ansible.builtin.assert:
+        that:
+          - result.diff is defined
+        fail_msg: "diff output missing from check result"
+      when: result.diff is defined
+
+...
diff --git a/extensions/molecule/service_key/check/molecule.yml b/extensions/molecule/service_nodes/check/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/check/molecule.yml
rename to extensions/molecule/service_nodes/check/molecule.yml
diff --git a/extensions/molecule/service_nodes/check/prepare.yml b/extensions/molecule/service_nodes/check/prepare.yml
new file mode 100644
index 00000000..e3a10542
--- /dev/null
+++ b/extensions/molecule/service_nodes/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_nodes (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_nodes as check-mode baseline (prerequisite for check)
+      ansible.platform.service_nodes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_node/check/vars.yml b/extensions/molecule/service_nodes/check/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/check/vars.yml
rename to extensions/molecule/service_nodes/check/vars.yml
diff --git a/extensions/molecule/service_node/check/verify.yml b/extensions/molecule/service_nodes/check/verify.yml
similarity index 83%
rename from extensions/molecule/service_node/check/verify.yml
rename to extensions/molecule/service_nodes/check/verify.yml
index a5354d02..20fc42cf 100644
--- a/extensions/molecule/service_node/check/verify.yml
+++ b/extensions/molecule/service_nodes/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_node (check)"
+- name: "Verify — service_nodes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_node (check mode must not have applied changes)
-      ansible.platform.service_node:
+    - name: Gather service_nodes (check mode must not have applied changes)
+      ansible.platform.service_nodes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_node/deleted/cleanup.yml b/extensions/molecule/service_nodes/deleted/cleanup.yml
similarity index 85%
rename from extensions/molecule/service_node/deleted/cleanup.yml
rename to extensions/molecule/service_nodes/deleted/cleanup.yml
index 9941068e..9898d01e 100644
--- a/extensions/molecule/service_node/deleted/cleanup.yml
+++ b/extensions/molecule/service_nodes/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — service_node (deleted)"
+- name: "Cleanup — service_nodes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/organization/deleted/converge.yml b/extensions/molecule/service_nodes/deleted/converge.yml
similarity index 72%
rename from extensions/molecule/organization/deleted/converge.yml
rename to extensions/molecule/service_nodes/deleted/converge.yml
index c8244804..8993e9f6 100644
--- a/extensions/molecule/organization/deleted/converge.yml
+++ b/extensions/molecule/service_nodes/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (deleted)"
+- name: "Converge — service_nodes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=deleted
-      ansible.platform.organization:
+    - name: Run ansible.platform.service_nodes with state=deleted
+      ansible.platform.service_nodes:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/service_key/deleted/molecule.yml b/extensions/molecule/service_nodes/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/deleted/molecule.yml
rename to extensions/molecule/service_nodes/deleted/molecule.yml
diff --git a/extensions/molecule/application/replaced/prepare.yml b/extensions/molecule/service_nodes/deleted/prepare.yml
similarity index 70%
rename from extensions/molecule/application/replaced/prepare.yml
rename to extensions/molecule/service_nodes/deleted/prepare.yml
index c7ff2740..37a58d0d 100644
--- a/extensions/molecule/application/replaced/prepare.yml
+++ b/extensions/molecule/service_nodes/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — application (replaced)"
+- name: "Prepare — service_nodes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed application to be replaced (prerequisite for replaced)
-      ansible.platform.application:
+    - name: Seed service_nodes to be deleted (prerequisite for deleted)
+      ansible.platform.service_nodes:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_node/deleted/vars.yml b/extensions/molecule/service_nodes/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/deleted/vars.yml
rename to extensions/molecule/service_nodes/deleted/vars.yml
diff --git a/extensions/molecule/service_node/deleted/verify.yml b/extensions/molecule/service_nodes/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/service_node/deleted/verify.yml
rename to extensions/molecule/service_nodes/deleted/verify.yml
index 0b6e652d..429a33e3 100644
--- a/extensions/molecule/service_node/deleted/verify.yml
+++ b/extensions/molecule/service_nodes/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_node (deleted)"
+- name: "Verify — service_nodes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_node (should be absent after deleted)
-      ansible.platform.service_node:
+    - name: Gather service_nodes (should be absent after deleted)
+      ansible.platform.service_nodes:
         config:
           - name: "int-snode-alpha"
         state: gathered
diff --git a/extensions/molecule/service_node/merged/cleanup.yml b/extensions/molecule/service_nodes/gathered/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_node/merged/cleanup.yml
rename to extensions/molecule/service_nodes/gathered/cleanup.yml
index ca0712a2..5d0763d3 100644
--- a/extensions/molecule/service_node/merged/cleanup.yml
+++ b/extensions/molecule/service_nodes/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_node (merged)"
+- name: "Cleanup — service_nodes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-snode-alpha (test teardown)
-      ansible.platform.service_node:
+      ansible.platform.service_nodes:
         config:
           - name: "int-snode-alpha"
         state: deleted
diff --git a/extensions/molecule/application/gathered/converge.yml b/extensions/molecule/service_nodes/gathered/converge.yml
similarity index 72%
rename from extensions/molecule/application/gathered/converge.yml
rename to extensions/molecule/service_nodes/gathered/converge.yml
index 1816e8ad..6ac02b9d 100644
--- a/extensions/molecule/application/gathered/converge.yml
+++ b/extensions/molecule/service_nodes/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (gathered)"
+- name: "Converge — service_nodes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=gathered
-      ansible.platform.application:
+    - name: Run ansible.platform.service_nodes with state=gathered
+      ansible.platform.service_nodes:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/service_key/gathered/molecule.yml b/extensions/molecule/service_nodes/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/gathered/molecule.yml
rename to extensions/molecule/service_nodes/gathered/molecule.yml
diff --git a/extensions/molecule/service_nodes/gathered/prepare.yml b/extensions/molecule/service_nodes/gathered/prepare.yml
new file mode 100644
index 00000000..a3751f44
--- /dev/null
+++ b/extensions/molecule/service_nodes/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_nodes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_nodes to be gathered (prerequisite for gathered)
+      ansible.platform.service_nodes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_node/gathered/vars.yml b/extensions/molecule/service_nodes/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/gathered/vars.yml
rename to extensions/molecule/service_nodes/gathered/vars.yml
diff --git a/extensions/molecule/service_nodes/gathered/verify.yml b/extensions/molecule/service_nodes/gathered/verify.yml
new file mode 100644
index 00000000..6853aee6
--- /dev/null
+++ b/extensions/molecule/service_nodes/gathered/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_nodes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_nodes (assert present after gathered)
+      ansible.platform.service_nodes:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after gathered
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service_key/inventory.yml b/extensions/molecule/service_nodes/inventory.yml
similarity index 100%
rename from extensions/molecule/service_key/inventory.yml
rename to extensions/molecule/service_nodes/inventory.yml
diff --git a/extensions/molecule/service_node/gathered/cleanup.yml b/extensions/molecule/service_nodes/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_node/gathered/cleanup.yml
rename to extensions/molecule/service_nodes/merged/cleanup.yml
index 0814e372..d2b2c4d4 100644
--- a/extensions/molecule/service_node/gathered/cleanup.yml
+++ b/extensions/molecule/service_nodes/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_node (gathered)"
+- name: "Cleanup — service_nodes (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-snode-alpha (test teardown)
-      ansible.platform.service_node:
+      ansible.platform.service_nodes:
         config:
           - name: "int-snode-alpha"
         state: deleted
diff --git a/extensions/molecule/service_nodes/merged/converge.yml b/extensions/molecule/service_nodes/merged/converge.yml
new file mode 100644
index 00000000..78dc5b4a
--- /dev/null
+++ b/extensions/molecule/service_nodes/merged/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_nodes (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_nodes with state=merged
+      ansible.platform.service_nodes:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service_key/merged/molecule.yml b/extensions/molecule/service_nodes/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/merged/molecule.yml
rename to extensions/molecule/service_nodes/merged/molecule.yml
diff --git a/extensions/molecule/service_node/merged/vars.yml b/extensions/molecule/service_nodes/merged/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/merged/vars.yml
rename to extensions/molecule/service_nodes/merged/vars.yml
diff --git a/extensions/molecule/service_nodes/merged/verify.yml b/extensions/molecule/service_nodes/merged/verify.yml
new file mode 100644
index 00000000..02582976
--- /dev/null
+++ b/extensions/molecule/service_nodes/merged/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_nodes (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_nodes (assert present after merged)
+      ansible.platform.service_nodes:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after merged
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service_nodes/overridden/cleanup.yml b/extensions/molecule/service_nodes/overridden/cleanup.yml
new file mode 100644
index 00000000..c250a18a
--- /dev/null
+++ b/extensions/molecule/service_nodes/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — service_nodes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-snode-alpha (test teardown)
+      ansible.platform.service_nodes:
+        config:
+          - name: "int-snode-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/application/overridden/converge.yml b/extensions/molecule/service_nodes/overridden/converge.yml
similarity index 72%
rename from extensions/molecule/application/overridden/converge.yml
rename to extensions/molecule/service_nodes/overridden/converge.yml
index cfe10c3b..6c5ddf2c 100644
--- a/extensions/molecule/application/overridden/converge.yml
+++ b/extensions/molecule/service_nodes/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (overridden)"
+- name: "Converge — service_nodes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=overridden
-      ansible.platform.application:
+    - name: Run ansible.platform.service_nodes with state=overridden
+      ansible.platform.service_nodes:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/service_key/overridden/molecule.yml b/extensions/molecule/service_nodes/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/overridden/molecule.yml
rename to extensions/molecule/service_nodes/overridden/molecule.yml
diff --git a/extensions/molecule/service_nodes/overridden/prepare.yml b/extensions/molecule/service_nodes/overridden/prepare.yml
new file mode 100644
index 00000000..0662c3df
--- /dev/null
+++ b/extensions/molecule/service_nodes/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — service_nodes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.service_nodes:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_node/overridden/vars.yml b/extensions/molecule/service_nodes/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/overridden/vars.yml
rename to extensions/molecule/service_nodes/overridden/vars.yml
diff --git a/extensions/molecule/service_node/overridden/verify.yml b/extensions/molecule/service_nodes/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/service_node/overridden/verify.yml
rename to extensions/molecule/service_nodes/overridden/verify.yml
index 8ad20738..e8dbbd9a 100644
--- a/extensions/molecule/service_node/overridden/verify.yml
+++ b/extensions/molecule/service_nodes/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_node (overridden)"
+- name: "Verify — service_nodes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all service_node resources (verify overridden final state)
-      ansible.platform.service_node:
+    - name: Gather all service_nodes resources (verify overridden final state)
+      ansible.platform.service_nodes:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/service_node/overridden/cleanup.yml b/extensions/molecule/service_nodes/replaced/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_node/overridden/cleanup.yml
rename to extensions/molecule/service_nodes/replaced/cleanup.yml
index 61ae8ced..d10c510c 100644
--- a/extensions/molecule/service_node/overridden/cleanup.yml
+++ b/extensions/molecule/service_nodes/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_node (overridden)"
+- name: "Cleanup — service_nodes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-snode-alpha (test teardown)
-      ansible.platform.service_node:
+      ansible.platform.service_nodes:
         config:
           - name: "int-snode-alpha"
         state: deleted
diff --git a/extensions/molecule/application/replaced/converge.yml b/extensions/molecule/service_nodes/replaced/converge.yml
similarity index 72%
rename from extensions/molecule/application/replaced/converge.yml
rename to extensions/molecule/service_nodes/replaced/converge.yml
index 7786a46d..3cbea155 100644
--- a/extensions/molecule/application/replaced/converge.yml
+++ b/extensions/molecule/service_nodes/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (replaced)"
+- name: "Converge — service_nodes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=replaced
-      ansible.platform.application:
+    - name: Run ansible.platform.service_nodes with state=replaced
+      ansible.platform.service_nodes:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/service_key/replaced/molecule.yml b/extensions/molecule/service_nodes/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/service_key/replaced/molecule.yml
rename to extensions/molecule/service_nodes/replaced/molecule.yml
diff --git a/extensions/molecule/service_nodes/replaced/prepare.yml b/extensions/molecule/service_nodes/replaced/prepare.yml
new file mode 100644
index 00000000..f47b8226
--- /dev/null
+++ b/extensions/molecule/service_nodes/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_nodes (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_nodes to be replaced (prerequisite for replaced)
+      ansible.platform.service_nodes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_node/replaced/vars.yml b/extensions/molecule/service_nodes/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/service_node/replaced/vars.yml
rename to extensions/molecule/service_nodes/replaced/vars.yml
diff --git a/extensions/molecule/service_node/replaced/verify.yml b/extensions/molecule/service_nodes/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/service_node/replaced/verify.yml
rename to extensions/molecule/service_nodes/replaced/verify.yml
index 115471bb..7a965abc 100644
--- a/extensions/molecule/service_node/replaced/verify.yml
+++ b/extensions/molecule/service_nodes/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_node (replaced)"
+- name: "Verify — service_nodes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_node (assert present after replaced)
-      ansible.platform.service_node:
+    - name: Gather service_nodes (assert present after replaced)
+      ansible.platform.service_nodes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_type/check/converge.yml b/extensions/molecule/service_type/check/converge.yml
deleted file mode 100644
index 49b64481..00000000
--- a/extensions/molecule/service_type/check/converge.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: "Converge — service_type (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_type with state=merged
-      ansible.platform.service_type:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      check_mode: true
-      diff: true
-      register: result
-
-    - name: Assert check mode predicted a change
-      ansible.builtin.assert:
-        that:
-          - result.changed == true
-          - result.before is defined
-          - result.after is defined
-        fail_msg: "check mode should predict a change. got={{ result }}"
-
-    - name: Assert diff output is present
-      ansible.builtin.assert:
-        that:
-          - result.diff is defined
-        fail_msg: "diff output missing from check result"
-      when: result.diff is defined
-
-...
diff --git a/extensions/molecule/service_type/check/prepare.yml b/extensions/molecule/service_type/check/prepare.yml
deleted file mode 100644
index 3d84e1b8..00000000
--- a/extensions/molecule/service_type/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_type (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_type as check-mode baseline (prerequisite for check)
-      ansible.platform.service_type:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_type/deleted/prepare.yml b/extensions/molecule/service_type/deleted/prepare.yml
deleted file mode 100644
index 63cfc2db..00000000
--- a/extensions/molecule/service_type/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_type (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_type to be deleted (prerequisite for deleted)
-      ansible.platform.service_type:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_type/gathered/converge.yml b/extensions/molecule/service_type/gathered/converge.yml
deleted file mode 100644
index 5ca46040..00000000
--- a/extensions/molecule/service_type/gathered/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_type (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_type with state=gathered
-      ansible.platform.service_type:
-        config:
-          - "{{ expected_config }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_type/gathered/prepare.yml b/extensions/molecule/service_type/gathered/prepare.yml
deleted file mode 100644
index 4c963148..00000000
--- a/extensions/molecule/service_type/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_type (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_type to be gathered (prerequisite for gathered)
-      ansible.platform.service_type:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_type/gathered/verify.yml b/extensions/molecule/service_type/gathered/verify.yml
deleted file mode 100644
index 25e558d5..00000000
--- a/extensions/molecule/service_type/gathered/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_type (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_type (assert present after gathered)
-      ansible.platform.service_type:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after gathered
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_type/merged/converge.yml b/extensions/molecule/service_type/merged/converge.yml
deleted file mode 100644
index 3b5776a5..00000000
--- a/extensions/molecule/service_type/merged/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_type (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_type with state=merged
-      ansible.platform.service_type:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_type/merged/verify.yml b/extensions/molecule/service_type/merged/verify.yml
deleted file mode 100644
index dbfde258..00000000
--- a/extensions/molecule/service_type/merged/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — service_type (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather service_type (assert present after merged)
-      ansible.platform.service_type:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after merged
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/service_type/overridden/prepare.yml b/extensions/molecule/service_type/overridden/prepare.yml
deleted file mode 100644
index 5214a653..00000000
--- a/extensions/molecule/service_type/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — service_type (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.service_type:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_type/replaced/cleanup.yml b/extensions/molecule/service_type/replaced/cleanup.yml
deleted file mode 100644
index ec605a90..00000000
--- a/extensions/molecule/service_type/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — service_type (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-stype-alpha (test teardown)
-      ansible.platform.service_type:
-        config:
-          - name: "int-stype-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/service_type/replaced/converge.yml b/extensions/molecule/service_type/replaced/converge.yml
deleted file mode 100644
index d4874a38..00000000
--- a/extensions/molecule/service_type/replaced/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — service_type (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.service_type with state=replaced
-      ansible.platform.service_type:
-        config:
-          - "{{ expected_config }}"
-        state: replaced
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/service_type/replaced/prepare.yml b/extensions/molecule/service_type/replaced/prepare.yml
deleted file mode 100644
index 6755f467..00000000
--- a/extensions/molecule/service_type/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — service_type (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed service_type to be replaced (prerequisite for replaced)
-      ansible.platform.service_type:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/service_type/check/cleanup.yml b/extensions/molecule/service_types/check/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_type/check/cleanup.yml
rename to extensions/molecule/service_types/check/cleanup.yml
index 30650b73..219c2d77 100644
--- a/extensions/molecule/service_type/check/cleanup.yml
+++ b/extensions/molecule/service_types/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_type (check)"
+- name: "Cleanup — service_types (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-stype-alpha (test teardown)
-      ansible.platform.service_type:
+      ansible.platform.service_types:
         config:
           - name: "int-stype-alpha"
         state: deleted
diff --git a/extensions/molecule/service_types/check/converge.yml b/extensions/molecule/service_types/check/converge.yml
new file mode 100644
index 00000000..69c6e606
--- /dev/null
+++ b/extensions/molecule/service_types/check/converge.yml
@@ -0,0 +1,36 @@
+---
+- name: "Converge — service_types (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_types with state=merged
+      ansible.platform.service_types:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      check_mode: true
+      diff: true
+      register: result
+
+    - name: Assert check mode predicted a change
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.before is defined
+          - result.after is defined
+        fail_msg: "check mode should predict a change. got={{ result }}"
+
+    - name: Assert diff output is present
+      ansible.builtin.assert:
+        that:
+          - result.diff is defined
+        fail_msg: "diff output missing from check result"
+      when: result.diff is defined
+
+...
diff --git a/extensions/molecule/service_node/check/molecule.yml b/extensions/molecule/service_types/check/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/check/molecule.yml
rename to extensions/molecule/service_types/check/molecule.yml
diff --git a/extensions/molecule/service_types/check/prepare.yml b/extensions/molecule/service_types/check/prepare.yml
new file mode 100644
index 00000000..a5cc56d8
--- /dev/null
+++ b/extensions/molecule/service_types/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_types (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_types as check-mode baseline (prerequisite for check)
+      ansible.platform.service_types:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_type/check/vars.yml b/extensions/molecule/service_types/check/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/check/vars.yml
rename to extensions/molecule/service_types/check/vars.yml
diff --git a/extensions/molecule/service_type/check/verify.yml b/extensions/molecule/service_types/check/verify.yml
similarity index 83%
rename from extensions/molecule/service_type/check/verify.yml
rename to extensions/molecule/service_types/check/verify.yml
index dbc62b35..d81c40d8 100644
--- a/extensions/molecule/service_type/check/verify.yml
+++ b/extensions/molecule/service_types/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_type (check)"
+- name: "Verify — service_types (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_type (check mode must not have applied changes)
-      ansible.platform.service_type:
+    - name: Gather service_types (check mode must not have applied changes)
+      ansible.platform.service_types:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_type/deleted/cleanup.yml b/extensions/molecule/service_types/deleted/cleanup.yml
similarity index 85%
rename from extensions/molecule/service_type/deleted/cleanup.yml
rename to extensions/molecule/service_types/deleted/cleanup.yml
index e437efa8..c87ed1d4 100644
--- a/extensions/molecule/service_type/deleted/cleanup.yml
+++ b/extensions/molecule/service_types/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — service_type (deleted)"
+- name: "Cleanup — service_types (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/application/deleted/converge.yml b/extensions/molecule/service_types/deleted/converge.yml
similarity index 72%
rename from extensions/molecule/application/deleted/converge.yml
rename to extensions/molecule/service_types/deleted/converge.yml
index 9b7dde28..f2fdd35e 100644
--- a/extensions/molecule/application/deleted/converge.yml
+++ b/extensions/molecule/service_types/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — application (deleted)"
+- name: "Converge — service_types (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.application with state=deleted
-      ansible.platform.application:
+    - name: Run ansible.platform.service_types with state=deleted
+      ansible.platform.service_types:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/service_node/deleted/molecule.yml b/extensions/molecule/service_types/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/deleted/molecule.yml
rename to extensions/molecule/service_types/deleted/molecule.yml
diff --git a/extensions/molecule/application/check/prepare.yml b/extensions/molecule/service_types/deleted/prepare.yml
similarity index 70%
rename from extensions/molecule/application/check/prepare.yml
rename to extensions/molecule/service_types/deleted/prepare.yml
index 25dbdffc..e45df2ef 100644
--- a/extensions/molecule/application/check/prepare.yml
+++ b/extensions/molecule/service_types/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — application (check)"
+- name: "Prepare — service_types (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed application as check-mode baseline (prerequisite for check)
-      ansible.platform.application:
+    - name: Seed service_types to be deleted (prerequisite for deleted)
+      ansible.platform.service_types:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service_type/deleted/vars.yml b/extensions/molecule/service_types/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/deleted/vars.yml
rename to extensions/molecule/service_types/deleted/vars.yml
diff --git a/extensions/molecule/service_type/deleted/verify.yml b/extensions/molecule/service_types/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/service_type/deleted/verify.yml
rename to extensions/molecule/service_types/deleted/verify.yml
index 71401ac9..f4779c85 100644
--- a/extensions/molecule/service_type/deleted/verify.yml
+++ b/extensions/molecule/service_types/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_type (deleted)"
+- name: "Verify — service_types (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_type (should be absent after deleted)
-      ansible.platform.service_type:
+    - name: Gather service_types (should be absent after deleted)
+      ansible.platform.service_types:
         config:
           - name: "int-stype-alpha"
         state: gathered
diff --git a/extensions/molecule/service_type/merged/cleanup.yml b/extensions/molecule/service_types/gathered/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_type/merged/cleanup.yml
rename to extensions/molecule/service_types/gathered/cleanup.yml
index 623cbeba..4ffe9350 100644
--- a/extensions/molecule/service_type/merged/cleanup.yml
+++ b/extensions/molecule/service_types/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_type (merged)"
+- name: "Cleanup — service_types (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-stype-alpha (test teardown)
-      ansible.platform.service_type:
+      ansible.platform.service_types:
         config:
           - name: "int-stype-alpha"
         state: deleted
diff --git a/extensions/molecule/service_types/gathered/converge.yml b/extensions/molecule/service_types/gathered/converge.yml
new file mode 100644
index 00000000..4eddc766
--- /dev/null
+++ b/extensions/molecule/service_types/gathered/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_types (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_types with state=gathered
+      ansible.platform.service_types:
+        config:
+          - "{{ expected_config }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service_node/gathered/molecule.yml b/extensions/molecule/service_types/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/gathered/molecule.yml
rename to extensions/molecule/service_types/gathered/molecule.yml
diff --git a/extensions/molecule/service_types/gathered/prepare.yml b/extensions/molecule/service_types/gathered/prepare.yml
new file mode 100644
index 00000000..3776d29e
--- /dev/null
+++ b/extensions/molecule/service_types/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_types (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_types to be gathered (prerequisite for gathered)
+      ansible.platform.service_types:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_type/gathered/vars.yml b/extensions/molecule/service_types/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/gathered/vars.yml
rename to extensions/molecule/service_types/gathered/vars.yml
diff --git a/extensions/molecule/service_types/gathered/verify.yml b/extensions/molecule/service_types/gathered/verify.yml
new file mode 100644
index 00000000..b849bbb4
--- /dev/null
+++ b/extensions/molecule/service_types/gathered/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_types (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_types (assert present after gathered)
+      ansible.platform.service_types:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after gathered
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service_node/inventory.yml b/extensions/molecule/service_types/inventory.yml
similarity index 100%
rename from extensions/molecule/service_node/inventory.yml
rename to extensions/molecule/service_types/inventory.yml
diff --git a/extensions/molecule/service_type/gathered/cleanup.yml b/extensions/molecule/service_types/merged/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_type/gathered/cleanup.yml
rename to extensions/molecule/service_types/merged/cleanup.yml
index ba8c7988..13b65f8d 100644
--- a/extensions/molecule/service_type/gathered/cleanup.yml
+++ b/extensions/molecule/service_types/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_type (gathered)"
+- name: "Cleanup — service_types (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-stype-alpha (test teardown)
-      ansible.platform.service_type:
+      ansible.platform.service_types:
         config:
           - name: "int-stype-alpha"
         state: deleted
diff --git a/extensions/molecule/service_types/merged/converge.yml b/extensions/molecule/service_types/merged/converge.yml
new file mode 100644
index 00000000..ea66e999
--- /dev/null
+++ b/extensions/molecule/service_types/merged/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_types (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_types with state=merged
+      ansible.platform.service_types:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service_node/merged/molecule.yml b/extensions/molecule/service_types/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/merged/molecule.yml
rename to extensions/molecule/service_types/merged/molecule.yml
diff --git a/extensions/molecule/service_type/merged/vars.yml b/extensions/molecule/service_types/merged/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/merged/vars.yml
rename to extensions/molecule/service_types/merged/vars.yml
diff --git a/extensions/molecule/service_types/merged/verify.yml b/extensions/molecule/service_types/merged/verify.yml
new file mode 100644
index 00000000..16e5a5e0
--- /dev/null
+++ b/extensions/molecule/service_types/merged/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — service_types (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather service_types (assert present after merged)
+      ansible.platform.service_types:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after merged
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/service_types/overridden/cleanup.yml b/extensions/molecule/service_types/overridden/cleanup.yml
new file mode 100644
index 00000000..bb720a68
--- /dev/null
+++ b/extensions/molecule/service_types/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — service_types (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-stype-alpha (test teardown)
+      ansible.platform.service_types:
+        config:
+          - name: "int-stype-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/organization/overridden/converge.yml b/extensions/molecule/service_types/overridden/converge.yml
similarity index 72%
rename from extensions/molecule/organization/overridden/converge.yml
rename to extensions/molecule/service_types/overridden/converge.yml
index 0ffbd13f..bdd526a3 100644
--- a/extensions/molecule/organization/overridden/converge.yml
+++ b/extensions/molecule/service_types/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — organization (overridden)"
+- name: "Converge — service_types (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.organization with state=overridden
-      ansible.platform.organization:
+    - name: Run ansible.platform.service_types with state=overridden
+      ansible.platform.service_types:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/service_node/overridden/molecule.yml b/extensions/molecule/service_types/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/overridden/molecule.yml
rename to extensions/molecule/service_types/overridden/molecule.yml
diff --git a/extensions/molecule/service_types/overridden/prepare.yml b/extensions/molecule/service_types/overridden/prepare.yml
new file mode 100644
index 00000000..9cea1e82
--- /dev/null
+++ b/extensions/molecule/service_types/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — service_types (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.service_types:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_type/overridden/vars.yml b/extensions/molecule/service_types/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/overridden/vars.yml
rename to extensions/molecule/service_types/overridden/vars.yml
diff --git a/extensions/molecule/service_type/overridden/verify.yml b/extensions/molecule/service_types/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/service_type/overridden/verify.yml
rename to extensions/molecule/service_types/overridden/verify.yml
index edf8fb36..4746d8b5 100644
--- a/extensions/molecule/service_type/overridden/verify.yml
+++ b/extensions/molecule/service_types/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_type (overridden)"
+- name: "Verify — service_types (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all service_type resources (verify overridden final state)
-      ansible.platform.service_type:
+    - name: Gather all service_types resources (verify overridden final state)
+      ansible.platform.service_types:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/service_type/overridden/cleanup.yml b/extensions/molecule/service_types/replaced/cleanup.yml
similarity index 84%
rename from extensions/molecule/service_type/overridden/cleanup.yml
rename to extensions/molecule/service_types/replaced/cleanup.yml
index 2df00422..55737090 100644
--- a/extensions/molecule/service_type/overridden/cleanup.yml
+++ b/extensions/molecule/service_types/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service_type (overridden)"
+- name: "Cleanup — service_types (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-stype-alpha (test teardown)
-      ansible.platform.service_type:
+      ansible.platform.service_types:
         config:
           - name: "int-stype-alpha"
         state: deleted
diff --git a/extensions/molecule/service_types/replaced/converge.yml b/extensions/molecule/service_types/replaced/converge.yml
new file mode 100644
index 00000000..c98384f7
--- /dev/null
+++ b/extensions/molecule/service_types/replaced/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — service_types (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.service_types with state=replaced
+      ansible.platform.service_types:
+        config:
+          - "{{ expected_config }}"
+        state: replaced
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/service_node/replaced/molecule.yml b/extensions/molecule/service_types/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/service_node/replaced/molecule.yml
rename to extensions/molecule/service_types/replaced/molecule.yml
diff --git a/extensions/molecule/service_types/replaced/prepare.yml b/extensions/molecule/service_types/replaced/prepare.yml
new file mode 100644
index 00000000..165d409c
--- /dev/null
+++ b/extensions/molecule/service_types/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — service_types (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed service_types to be replaced (prerequisite for replaced)
+      ansible.platform.service_types:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service_type/replaced/vars.yml b/extensions/molecule/service_types/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/service_type/replaced/vars.yml
rename to extensions/molecule/service_types/replaced/vars.yml
diff --git a/extensions/molecule/service_type/replaced/verify.yml b/extensions/molecule/service_types/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/service_type/replaced/verify.yml
rename to extensions/molecule/service_types/replaced/verify.yml
index 67f25fbb..f45c471e 100644
--- a/extensions/molecule/service_type/replaced/verify.yml
+++ b/extensions/molecule/service_types/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service_type (replaced)"
+- name: "Verify — service_types (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service_type (assert present after replaced)
-      ansible.platform.service_type:
+    - name: Gather service_types (assert present after replaced)
+      ansible.platform.service_types:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service/check/cleanup.yml b/extensions/molecule/services/check/cleanup.yml
similarity index 86%
rename from extensions/molecule/service/check/cleanup.yml
rename to extensions/molecule/services/check/cleanup.yml
index 76bf1ee2..1aef0197 100644
--- a/extensions/molecule/service/check/cleanup.yml
+++ b/extensions/molecule/services/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service (check)"
+- name: "Cleanup — services (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-svc-alpha (test teardown)
-      ansible.platform.service:
+      ansible.platform.services:
         config:
           - name: "int-svc-alpha"
         state: deleted
diff --git a/extensions/molecule/service/check/converge.yml b/extensions/molecule/services/check/converge.yml
similarity index 87%
rename from extensions/molecule/service/check/converge.yml
rename to extensions/molecule/services/check/converge.yml
index f37c53c8..a433f2d9 100644
--- a/extensions/molecule/service/check/converge.yml
+++ b/extensions/molecule/services/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (check)"
+- name: "Converge — services (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=merged
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=merged
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/service_type/check/molecule.yml b/extensions/molecule/services/check/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/check/molecule.yml
rename to extensions/molecule/services/check/molecule.yml
diff --git a/extensions/molecule/services/check/prepare.yml b/extensions/molecule/services/check/prepare.yml
new file mode 100644
index 00000000..087f5b46
--- /dev/null
+++ b/extensions/molecule/services/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — services (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed services as check-mode baseline (prerequisite for check)
+      ansible.platform.services:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service/check/vars.yml b/extensions/molecule/services/check/vars.yml
similarity index 100%
rename from extensions/molecule/service/check/vars.yml
rename to extensions/molecule/services/check/vars.yml
diff --git a/extensions/molecule/service/check/verify.yml b/extensions/molecule/services/check/verify.yml
similarity index 84%
rename from extensions/molecule/service/check/verify.yml
rename to extensions/molecule/services/check/verify.yml
index fe8ae69c..dd34cd13 100644
--- a/extensions/molecule/service/check/verify.yml
+++ b/extensions/molecule/services/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (check)"
+- name: "Verify — services (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service (check mode must not have applied changes)
-      ansible.platform.service:
+    - name: Gather services (check mode must not have applied changes)
+      ansible.platform.services:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service/deleted/cleanup.yml b/extensions/molecule/services/deleted/cleanup.yml
similarity index 86%
rename from extensions/molecule/service/deleted/cleanup.yml
rename to extensions/molecule/services/deleted/cleanup.yml
index f372b2f2..ac773658 100644
--- a/extensions/molecule/service/deleted/cleanup.yml
+++ b/extensions/molecule/services/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — service (deleted)"
+- name: "Cleanup — services (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/service/deleted/converge.yml b/extensions/molecule/services/deleted/converge.yml
similarity index 74%
rename from extensions/molecule/service/deleted/converge.yml
rename to extensions/molecule/services/deleted/converge.yml
index 2e263969..84e7271f 100644
--- a/extensions/molecule/service/deleted/converge.yml
+++ b/extensions/molecule/services/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (deleted)"
+- name: "Converge — services (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=deleted
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=deleted
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/service_type/deleted/molecule.yml b/extensions/molecule/services/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/deleted/molecule.yml
rename to extensions/molecule/services/deleted/molecule.yml
diff --git a/extensions/molecule/services/deleted/prepare.yml b/extensions/molecule/services/deleted/prepare.yml
new file mode 100644
index 00000000..91367edd
--- /dev/null
+++ b/extensions/molecule/services/deleted/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — services (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed services to be deleted (prerequisite for deleted)
+      ansible.platform.services:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service/deleted/vars.yml b/extensions/molecule/services/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/service/deleted/vars.yml
rename to extensions/molecule/services/deleted/vars.yml
diff --git a/extensions/molecule/service/deleted/verify.yml b/extensions/molecule/services/deleted/verify.yml
similarity index 83%
rename from extensions/molecule/service/deleted/verify.yml
rename to extensions/molecule/services/deleted/verify.yml
index f6c45c1a..abbde122 100644
--- a/extensions/molecule/service/deleted/verify.yml
+++ b/extensions/molecule/services/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (deleted)"
+- name: "Verify — services (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service (should be absent after deleted)
-      ansible.platform.service:
+    - name: Gather services (should be absent after deleted)
+      ansible.platform.services:
         config:
           - name: "int-svc-alpha"
         state: gathered
diff --git a/extensions/molecule/service/merged/cleanup.yml b/extensions/molecule/services/gathered/cleanup.yml
similarity index 85%
rename from extensions/molecule/service/merged/cleanup.yml
rename to extensions/molecule/services/gathered/cleanup.yml
index dd343a16..9e7bf49d 100644
--- a/extensions/molecule/service/merged/cleanup.yml
+++ b/extensions/molecule/services/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service (merged)"
+- name: "Cleanup — services (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-svc-alpha (test teardown)
-      ansible.platform.service:
+      ansible.platform.services:
         config:
           - name: "int-svc-alpha"
         state: deleted
diff --git a/extensions/molecule/service/gathered/converge.yml b/extensions/molecule/services/gathered/converge.yml
similarity index 74%
rename from extensions/molecule/service/gathered/converge.yml
rename to extensions/molecule/services/gathered/converge.yml
index c05de88e..8f8ef99f 100644
--- a/extensions/molecule/service/gathered/converge.yml
+++ b/extensions/molecule/services/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (gathered)"
+- name: "Converge — services (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=gathered
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=gathered
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/service_type/gathered/molecule.yml b/extensions/molecule/services/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/gathered/molecule.yml
rename to extensions/molecule/services/gathered/molecule.yml
diff --git a/extensions/molecule/http_port/deleted/prepare.yml b/extensions/molecule/services/gathered/prepare.yml
similarity index 72%
rename from extensions/molecule/http_port/deleted/prepare.yml
rename to extensions/molecule/services/gathered/prepare.yml
index 513fcbac..7a3bcc71 100644
--- a/extensions/molecule/http_port/deleted/prepare.yml
+++ b/extensions/molecule/services/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — http_port (deleted)"
+- name: "Prepare — services (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed http_port to be deleted (prerequisite for deleted)
-      ansible.platform.http_port:
+    - name: Seed services to be gathered (prerequisite for gathered)
+      ansible.platform.services:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/service/gathered/vars.yml b/extensions/molecule/services/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/service/gathered/vars.yml
rename to extensions/molecule/services/gathered/vars.yml
diff --git a/extensions/molecule/service/gathered/verify.yml b/extensions/molecule/services/gathered/verify.yml
similarity index 83%
rename from extensions/molecule/service/gathered/verify.yml
rename to extensions/molecule/services/gathered/verify.yml
index 18d663fb..4d85bbe9 100644
--- a/extensions/molecule/service/gathered/verify.yml
+++ b/extensions/molecule/services/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (gathered)"
+- name: "Verify — services (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service (assert present after gathered)
-      ansible.platform.service:
+    - name: Gather services (assert present after gathered)
+      ansible.platform.services:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/service_type/inventory.yml b/extensions/molecule/services/inventory.yml
similarity index 100%
rename from extensions/molecule/service_type/inventory.yml
rename to extensions/molecule/services/inventory.yml
diff --git a/extensions/molecule/service/gathered/cleanup.yml b/extensions/molecule/services/merged/cleanup.yml
similarity index 86%
rename from extensions/molecule/service/gathered/cleanup.yml
rename to extensions/molecule/services/merged/cleanup.yml
index 6848cb35..944a0c8c 100644
--- a/extensions/molecule/service/gathered/cleanup.yml
+++ b/extensions/molecule/services/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service (gathered)"
+- name: "Cleanup — services (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-svc-alpha (test teardown)
-      ansible.platform.service:
+      ansible.platform.services:
         config:
           - name: "int-svc-alpha"
         state: deleted
diff --git a/extensions/molecule/service/merged/converge.yml b/extensions/molecule/services/merged/converge.yml
similarity index 74%
rename from extensions/molecule/service/merged/converge.yml
rename to extensions/molecule/services/merged/converge.yml
index be2b3166..3b550c0f 100644
--- a/extensions/molecule/service/merged/converge.yml
+++ b/extensions/molecule/services/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (merged)"
+- name: "Converge — services (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=merged
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=merged
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/service_type/merged/molecule.yml b/extensions/molecule/services/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/merged/molecule.yml
rename to extensions/molecule/services/merged/molecule.yml
diff --git a/extensions/molecule/service/merged/vars.yml b/extensions/molecule/services/merged/vars.yml
similarity index 100%
rename from extensions/molecule/service/merged/vars.yml
rename to extensions/molecule/services/merged/vars.yml
diff --git a/extensions/molecule/service/merged/verify.yml b/extensions/molecule/services/merged/verify.yml
similarity index 83%
rename from extensions/molecule/service/merged/verify.yml
rename to extensions/molecule/services/merged/verify.yml
index 8828957b..72ee3de3 100644
--- a/extensions/molecule/service/merged/verify.yml
+++ b/extensions/molecule/services/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (merged)"
+- name: "Verify — services (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service (assert present after merged)
-      ansible.platform.service:
+    - name: Gather services (assert present after merged)
+      ansible.platform.services:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/services/overridden/cleanup.yml b/extensions/molecule/services/overridden/cleanup.yml
new file mode 100644
index 00000000..ac059804
--- /dev/null
+++ b/extensions/molecule/services/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — services (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-svc-alpha (test teardown)
+      ansible.platform.services:
+        config:
+          - name: "int-svc-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/service/overridden/converge.yml b/extensions/molecule/services/overridden/converge.yml
similarity index 74%
rename from extensions/molecule/service/overridden/converge.yml
rename to extensions/molecule/services/overridden/converge.yml
index 9ac04d2f..a5104d5c 100644
--- a/extensions/molecule/service/overridden/converge.yml
+++ b/extensions/molecule/services/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (overridden)"
+- name: "Converge — services (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=overridden
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=overridden
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/service_type/overridden/molecule.yml b/extensions/molecule/services/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/overridden/molecule.yml
rename to extensions/molecule/services/overridden/molecule.yml
diff --git a/extensions/molecule/service/overridden/prepare.yml b/extensions/molecule/services/overridden/prepare.yml
similarity index 85%
rename from extensions/molecule/service/overridden/prepare.yml
rename to extensions/molecule/services/overridden/prepare.yml
index 5f7cb6b1..222b4530 100644
--- a/extensions/molecule/service/overridden/prepare.yml
+++ b/extensions/molecule/services/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — service (overridden)"
+- name: "Prepare — services (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.service:
+      ansible.platform.services:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/service/overridden/vars.yml b/extensions/molecule/services/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/service/overridden/vars.yml
rename to extensions/molecule/services/overridden/vars.yml
diff --git a/extensions/molecule/service/overridden/verify.yml b/extensions/molecule/services/overridden/verify.yml
similarity index 87%
rename from extensions/molecule/service/overridden/verify.yml
rename to extensions/molecule/services/overridden/verify.yml
index 0f863922..75707bbf 100644
--- a/extensions/molecule/service/overridden/verify.yml
+++ b/extensions/molecule/services/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (overridden)"
+- name: "Verify — services (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all service resources (verify overridden final state)
-      ansible.platform.service:
+    - name: Gather all services resources (verify overridden final state)
+      ansible.platform.services:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/service/overridden/cleanup.yml b/extensions/molecule/services/replaced/cleanup.yml
similarity index 85%
rename from extensions/molecule/service/overridden/cleanup.yml
rename to extensions/molecule/services/replaced/cleanup.yml
index 0071c26c..4a29e08a 100644
--- a/extensions/molecule/service/overridden/cleanup.yml
+++ b/extensions/molecule/services/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — service (overridden)"
+- name: "Cleanup — services (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-svc-alpha (test teardown)
-      ansible.platform.service:
+      ansible.platform.services:
         config:
           - name: "int-svc-alpha"
         state: deleted
diff --git a/extensions/molecule/service/replaced/converge.yml b/extensions/molecule/services/replaced/converge.yml
similarity index 74%
rename from extensions/molecule/service/replaced/converge.yml
rename to extensions/molecule/services/replaced/converge.yml
index 07860fe5..8b8e1e99 100644
--- a/extensions/molecule/service/replaced/converge.yml
+++ b/extensions/molecule/services/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — service (replaced)"
+- name: "Converge — services (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.service with state=replaced
-      ansible.platform.service:
+    - name: Run ansible.platform.services with state=replaced
+      ansible.platform.services:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/service_type/replaced/molecule.yml b/extensions/molecule/services/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/service_type/replaced/molecule.yml
rename to extensions/molecule/services/replaced/molecule.yml
diff --git a/extensions/molecule/services/replaced/prepare.yml b/extensions/molecule/services/replaced/prepare.yml
new file mode 100644
index 00000000..e2c73580
--- /dev/null
+++ b/extensions/molecule/services/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — services (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed services to be replaced (prerequisite for replaced)
+      ansible.platform.services:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/service/replaced/vars.yml b/extensions/molecule/services/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/service/replaced/vars.yml
rename to extensions/molecule/services/replaced/vars.yml
diff --git a/extensions/molecule/service/replaced/verify.yml b/extensions/molecule/services/replaced/verify.yml
similarity index 88%
rename from extensions/molecule/service/replaced/verify.yml
rename to extensions/molecule/services/replaced/verify.yml
index 6636472f..04776ca5 100644
--- a/extensions/molecule/service/replaced/verify.yml
+++ b/extensions/molecule/services/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — service (replaced)"
+- name: "Verify — services (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather service (assert present after replaced)
-      ansible.platform.service:
+    - name: Gather services (assert present after replaced)
+      ansible.platform.services:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/team/check/prepare.yml b/extensions/molecule/team/check/prepare.yml
deleted file mode 100644
index ee998d07..00000000
--- a/extensions/molecule/team/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — team (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed team as check-mode baseline (prerequisite for check)
-      ansible.platform.team:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/team/replaced/cleanup.yml b/extensions/molecule/team/replaced/cleanup.yml
deleted file mode 100644
index cd1a45f4..00000000
--- a/extensions/molecule/team/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — team (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-team-alpha (test teardown)
-      ansible.platform.team:
-        config:
-          - name: "int-team-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/team/merged/cleanup.yml b/extensions/molecule/teams/check/cleanup.yml
similarity index 87%
rename from extensions/molecule/team/merged/cleanup.yml
rename to extensions/molecule/teams/check/cleanup.yml
index 09bae7fc..82563349 100644
--- a/extensions/molecule/team/merged/cleanup.yml
+++ b/extensions/molecule/teams/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — team (merged)"
+- name: "Cleanup — teams (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-team-alpha (test teardown)
-      ansible.platform.team:
+      ansible.platform.teams:
         config:
           - name: "int-team-alpha"
         state: deleted
diff --git a/extensions/molecule/route/check/converge.yml b/extensions/molecule/teams/check/converge.yml
similarity index 88%
rename from extensions/molecule/route/check/converge.yml
rename to extensions/molecule/teams/check/converge.yml
index 92f1dc74..f11e0249 100644
--- a/extensions/molecule/route/check/converge.yml
+++ b/extensions/molecule/teams/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (check)"
+- name: "Converge — teams (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=merged
-      ansible.platform.route:
+    - name: Run ansible.platform.teams with state=merged
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/team/check/molecule.yml b/extensions/molecule/teams/check/molecule.yml
similarity index 100%
rename from extensions/molecule/team/check/molecule.yml
rename to extensions/molecule/teams/check/molecule.yml
diff --git a/extensions/molecule/token/check/prepare.yml b/extensions/molecule/teams/check/prepare.yml
similarity index 74%
rename from extensions/molecule/token/check/prepare.yml
rename to extensions/molecule/teams/check/prepare.yml
index 66cefc72..9f5e99b0 100644
--- a/extensions/molecule/token/check/prepare.yml
+++ b/extensions/molecule/teams/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — token (check)"
+- name: "Prepare — teams (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed token as check-mode baseline (prerequisite for check)
-      ansible.platform.token:
+    - name: Seed teams as check-mode baseline (prerequisite for check)
+      ansible.platform.teams:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/team/check/vars.yml b/extensions/molecule/teams/check/vars.yml
similarity index 100%
rename from extensions/molecule/team/check/vars.yml
rename to extensions/molecule/teams/check/vars.yml
diff --git a/extensions/molecule/team/check/verify.yml b/extensions/molecule/teams/check/verify.yml
similarity index 85%
rename from extensions/molecule/team/check/verify.yml
rename to extensions/molecule/teams/check/verify.yml
index c4c56b4d..d1d40595 100644
--- a/extensions/molecule/team/check/verify.yml
+++ b/extensions/molecule/teams/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (check)"
+- name: "Verify — teams (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather team (check mode must not have applied changes)
-      ansible.platform.team:
+    - name: Gather teams (check mode must not have applied changes)
+      ansible.platform.teams:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/team/deleted/cleanup.yml b/extensions/molecule/teams/deleted/cleanup.yml
similarity index 87%
rename from extensions/molecule/team/deleted/cleanup.yml
rename to extensions/molecule/teams/deleted/cleanup.yml
index f8ec8eb1..105d82c3 100644
--- a/extensions/molecule/team/deleted/cleanup.yml
+++ b/extensions/molecule/teams/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — team (deleted)"
+- name: "Cleanup — teams (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/route/deleted/converge.yml b/extensions/molecule/teams/deleted/converge.yml
similarity index 75%
rename from extensions/molecule/route/deleted/converge.yml
rename to extensions/molecule/teams/deleted/converge.yml
index 7eec3d99..c73a92ff 100644
--- a/extensions/molecule/route/deleted/converge.yml
+++ b/extensions/molecule/teams/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (deleted)"
+- name: "Converge — teams (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=deleted
-      ansible.platform.route:
+    - name: Run ansible.platform.teams with state=deleted
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/team/deleted/molecule.yml b/extensions/molecule/teams/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/team/deleted/molecule.yml
rename to extensions/molecule/teams/deleted/molecule.yml
diff --git a/extensions/molecule/team/deleted/prepare.yml b/extensions/molecule/teams/deleted/prepare.yml
similarity index 74%
rename from extensions/molecule/team/deleted/prepare.yml
rename to extensions/molecule/teams/deleted/prepare.yml
index de701f48..1ff20006 100644
--- a/extensions/molecule/team/deleted/prepare.yml
+++ b/extensions/molecule/teams/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — team (deleted)"
+- name: "Prepare — teams (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed team to be deleted (prerequisite for deleted)
-      ansible.platform.team:
+    - name: Seed teams to be deleted (prerequisite for deleted)
+      ansible.platform.teams:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/team/deleted/vars.yml b/extensions/molecule/teams/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/team/deleted/vars.yml
rename to extensions/molecule/teams/deleted/vars.yml
diff --git a/extensions/molecule/team/deleted/verify.yml b/extensions/molecule/teams/deleted/verify.yml
similarity index 84%
rename from extensions/molecule/team/deleted/verify.yml
rename to extensions/molecule/teams/deleted/verify.yml
index 8ee1ebc9..942058ec 100644
--- a/extensions/molecule/team/deleted/verify.yml
+++ b/extensions/molecule/teams/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (deleted)"
+- name: "Verify — teams (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather team (should be absent after deleted)
-      ansible.platform.team:
+    - name: Gather teams (should be absent after deleted)
+      ansible.platform.teams:
         config:
           - name: "int-team-alpha"
         state: gathered
diff --git a/extensions/molecule/team/gathered/cleanup.yml b/extensions/molecule/teams/gathered/cleanup.yml
similarity index 86%
rename from extensions/molecule/team/gathered/cleanup.yml
rename to extensions/molecule/teams/gathered/cleanup.yml
index 323248f2..bb0c745a 100644
--- a/extensions/molecule/team/gathered/cleanup.yml
+++ b/extensions/molecule/teams/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — team (gathered)"
+- name: "Cleanup — teams (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-team-alpha (test teardown)
-      ansible.platform.team:
+      ansible.platform.teams:
         config:
           - name: "int-team-alpha"
         state: deleted
diff --git a/extensions/molecule/team/gathered/converge.yml b/extensions/molecule/teams/gathered/converge.yml
similarity index 75%
rename from extensions/molecule/team/gathered/converge.yml
rename to extensions/molecule/teams/gathered/converge.yml
index 1e73247a..d2644a0e 100644
--- a/extensions/molecule/team/gathered/converge.yml
+++ b/extensions/molecule/teams/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (gathered)"
+- name: "Converge — teams (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=gathered
-      ansible.platform.team:
+    - name: Run ansible.platform.teams with state=gathered
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/team/gathered/molecule.yml b/extensions/molecule/teams/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/team/gathered/molecule.yml
rename to extensions/molecule/teams/gathered/molecule.yml
diff --git a/extensions/molecule/route/replaced/prepare.yml b/extensions/molecule/teams/gathered/prepare.yml
similarity index 74%
rename from extensions/molecule/route/replaced/prepare.yml
rename to extensions/molecule/teams/gathered/prepare.yml
index c21d1755..272d54b5 100644
--- a/extensions/molecule/route/replaced/prepare.yml
+++ b/extensions/molecule/teams/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — route (replaced)"
+- name: "Prepare — teams (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed route to be replaced (prerequisite for replaced)
-      ansible.platform.route:
+    - name: Seed teams to be gathered (prerequisite for gathered)
+      ansible.platform.teams:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/team/gathered/vars.yml b/extensions/molecule/teams/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/team/gathered/vars.yml
rename to extensions/molecule/teams/gathered/vars.yml
diff --git a/extensions/molecule/team/gathered/verify.yml b/extensions/molecule/teams/gathered/verify.yml
similarity index 84%
rename from extensions/molecule/team/gathered/verify.yml
rename to extensions/molecule/teams/gathered/verify.yml
index 53feaf66..c3cbb53d 100644
--- a/extensions/molecule/team/gathered/verify.yml
+++ b/extensions/molecule/teams/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (gathered)"
+- name: "Verify — teams (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather team (assert present after gathered)
-      ansible.platform.team:
+    - name: Gather teams (assert present after gathered)
+      ansible.platform.teams:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/team/inventory.yml b/extensions/molecule/teams/inventory.yml
similarity index 100%
rename from extensions/molecule/team/inventory.yml
rename to extensions/molecule/teams/inventory.yml
diff --git a/extensions/molecule/team/check/cleanup.yml b/extensions/molecule/teams/merged/cleanup.yml
similarity index 87%
rename from extensions/molecule/team/check/cleanup.yml
rename to extensions/molecule/teams/merged/cleanup.yml
index 1bece8db..be68227e 100644
--- a/extensions/molecule/team/check/cleanup.yml
+++ b/extensions/molecule/teams/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — team (check)"
+- name: "Cleanup — teams (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-team-alpha (test teardown)
-      ansible.platform.team:
+      ansible.platform.teams:
         config:
           - name: "int-team-alpha"
         state: deleted
diff --git a/extensions/molecule/route/merged/converge.yml b/extensions/molecule/teams/merged/converge.yml
similarity index 76%
rename from extensions/molecule/route/merged/converge.yml
rename to extensions/molecule/teams/merged/converge.yml
index f674dc32..c798b886 100644
--- a/extensions/molecule/route/merged/converge.yml
+++ b/extensions/molecule/teams/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (merged)"
+- name: "Converge — teams (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=merged
-      ansible.platform.route:
+    - name: Run ansible.platform.teams with state=merged
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/team/merged/molecule.yml b/extensions/molecule/teams/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/team/merged/molecule.yml
rename to extensions/molecule/teams/merged/molecule.yml
diff --git a/extensions/molecule/team/merged/vars.yml b/extensions/molecule/teams/merged/vars.yml
similarity index 100%
rename from extensions/molecule/team/merged/vars.yml
rename to extensions/molecule/teams/merged/vars.yml
diff --git a/extensions/molecule/route/merged/verify.yml b/extensions/molecule/teams/merged/verify.yml
similarity index 84%
rename from extensions/molecule/route/merged/verify.yml
rename to extensions/molecule/teams/merged/verify.yml
index f79bd7ae..3cefe839 100644
--- a/extensions/molecule/route/merged/verify.yml
+++ b/extensions/molecule/teams/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — route (merged)"
+- name: "Verify — teams (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather route (assert present after merged)
-      ansible.platform.route:
+    - name: Gather teams (assert present after merged)
+      ansible.platform.teams:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/teams/overridden/cleanup.yml b/extensions/molecule/teams/overridden/cleanup.yml
new file mode 100644
index 00000000..152e9730
--- /dev/null
+++ b/extensions/molecule/teams/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — teams (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-team-alpha (test teardown)
+      ansible.platform.teams:
+        config:
+          - name: "int-team-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/route/overridden/converge.yml b/extensions/molecule/teams/overridden/converge.yml
similarity index 75%
rename from extensions/molecule/route/overridden/converge.yml
rename to extensions/molecule/teams/overridden/converge.yml
index 7be62978..474e6077 100644
--- a/extensions/molecule/route/overridden/converge.yml
+++ b/extensions/molecule/teams/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (overridden)"
+- name: "Converge — teams (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=overridden
-      ansible.platform.route:
+    - name: Run ansible.platform.teams with state=overridden
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/team/overridden/molecule.yml b/extensions/molecule/teams/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/team/overridden/molecule.yml
rename to extensions/molecule/teams/overridden/molecule.yml
diff --git a/extensions/molecule/team/overridden/prepare.yml b/extensions/molecule/teams/overridden/prepare.yml
similarity index 86%
rename from extensions/molecule/team/overridden/prepare.yml
rename to extensions/molecule/teams/overridden/prepare.yml
index f1fcfd32..25cf603b 100644
--- a/extensions/molecule/team/overridden/prepare.yml
+++ b/extensions/molecule/teams/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — team (overridden)"
+- name: "Prepare — teams (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.team:
+      ansible.platform.teams:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/team/overridden/vars.yml b/extensions/molecule/teams/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/team/overridden/vars.yml
rename to extensions/molecule/teams/overridden/vars.yml
diff --git a/extensions/molecule/team/overridden/verify.yml b/extensions/molecule/teams/overridden/verify.yml
similarity index 88%
rename from extensions/molecule/team/overridden/verify.yml
rename to extensions/molecule/teams/overridden/verify.yml
index 2938a3e5..021fc8b0 100644
--- a/extensions/molecule/team/overridden/verify.yml
+++ b/extensions/molecule/teams/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (overridden)"
+- name: "Verify — teams (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all team resources (verify overridden final state)
-      ansible.platform.team:
+    - name: Gather all teams resources (verify overridden final state)
+      ansible.platform.teams:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/team/overridden/cleanup.yml b/extensions/molecule/teams/replaced/cleanup.yml
similarity index 86%
rename from extensions/molecule/team/overridden/cleanup.yml
rename to extensions/molecule/teams/replaced/cleanup.yml
index e4349cac..ff9d4a72 100644
--- a/extensions/molecule/team/overridden/cleanup.yml
+++ b/extensions/molecule/teams/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — team (overridden)"
+- name: "Cleanup — teams (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-team-alpha (test teardown)
-      ansible.platform.team:
+      ansible.platform.teams:
         config:
           - name: "int-team-alpha"
         state: deleted
diff --git a/extensions/molecule/route/replaced/converge.yml b/extensions/molecule/teams/replaced/converge.yml
similarity index 75%
rename from extensions/molecule/route/replaced/converge.yml
rename to extensions/molecule/teams/replaced/converge.yml
index 47eaebf9..9af5eb15 100644
--- a/extensions/molecule/route/replaced/converge.yml
+++ b/extensions/molecule/teams/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (replaced)"
+- name: "Converge — teams (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=replaced
-      ansible.platform.route:
+    - name: Run ansible.platform.teams with state=replaced
+      ansible.platform.teams:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/team/replaced/molecule.yml b/extensions/molecule/teams/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/team/replaced/molecule.yml
rename to extensions/molecule/teams/replaced/molecule.yml
diff --git a/extensions/molecule/token/gathered/prepare.yml b/extensions/molecule/teams/replaced/prepare.yml
similarity index 74%
rename from extensions/molecule/token/gathered/prepare.yml
rename to extensions/molecule/teams/replaced/prepare.yml
index 9c8891cc..a9da08d8 100644
--- a/extensions/molecule/token/gathered/prepare.yml
+++ b/extensions/molecule/teams/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — token (gathered)"
+- name: "Prepare — teams (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed token to be gathered (prerequisite for gathered)
-      ansible.platform.token:
+    - name: Seed teams to be replaced (prerequisite for replaced)
+      ansible.platform.teams:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/team/replaced/vars.yml b/extensions/molecule/teams/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/team/replaced/vars.yml
rename to extensions/molecule/teams/replaced/vars.yml
diff --git a/extensions/molecule/team/replaced/verify.yml b/extensions/molecule/teams/replaced/verify.yml
similarity index 88%
rename from extensions/molecule/team/replaced/verify.yml
rename to extensions/molecule/teams/replaced/verify.yml
index de9a66c0..248d65e7 100644
--- a/extensions/molecule/team/replaced/verify.yml
+++ b/extensions/molecule/teams/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — team (replaced)"
+- name: "Verify — teams (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather team (assert present after replaced)
-      ansible.platform.team:
+    - name: Gather teams (assert present after replaced)
+      ansible.platform.teams:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/token/deleted/prepare.yml b/extensions/molecule/token/deleted/prepare.yml
deleted file mode 100644
index a93c814b..00000000
--- a/extensions/molecule/token/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — token (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed token to be deleted (prerequisite for deleted)
-      ansible.platform.token:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/token/overridden/.verify.yml.swp b/extensions/molecule/token/overridden/.verify.yml.swp
deleted file mode 100644
index 23fa71d92cf041e6e2b8108ba9f17d5d6a274c7b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2zmF3~6vyXKii3lILX#?bIL)0DukV7CD3(qFqzFZVGPKrsch(-=c*oiq`|kMN
z(9$GANJ&Hy3Q)u!K^chxq@+ucP(hh41qI*zWv_isj^Y|}Z>6txc4pr0d!PBPEz8qg
zzw*sx`YPBEI8F)Set)JPY_*o2om&#A?Q5U)?{kFK4XoQ|5{7T)H*7^}+}yV5mK(}Y
zwPfOS*Qh3Xt9B=}#;DM1o4Bg4H8j%4HXXFoj#r4u#s(JCMn<)~-BL-*j#ZlKC_)o0
z9q$Ia1G9fxJc9`w5&|d0+0QrDvtmDOoT1YneS1ji<}#T86JP>NfC(@GCcp%k029av
z_~DYch4YaT$7khvY3^KJ@`(vB0Vco%m;e)C0!)AjFaajO1egF5cn=B4NQgg{g?M-r
z$>ab3>i7SflS2FkJ%xUOeuC~occ3qzkD+DguMdUz6}kt7&^q+@2_arU&!O+25!8de
zgg$_NJTAl!&?P8<K7syO5#mqi33L^@2rWaej|uS#x({82473TYK#!60BPh%L=PZ9d
zm;e)C0!)AjFaaj;KOqnVfe=(4vDBtBaJ@D)ru!Yq_3g++)R$vLkuu7wh%P8EDc>0x
zP|x}{UAsm->H8{GQ3tyyQyEm3bmK;2@&uyhzs|c(MkPJpr_D`Tf2RoTkWj1>6-}o5
zzVz+#s@(n=bVu5FodnW3m6oGTO5{Mb>3rT-tB1B_cGsfJ?k?3ptR~izPB7{;>ZH&n
zvF@!^{8H7^&a1RNSK%Z#5K-H5w=<STM`(9Kq~id)fVW_5hFujtL><`U8qEe)y$eG|
zD7>h*{;aBZVMyOPzc-}noe6Os#Z0T7)SE3fScRz`X8UcC@6<L^OB596*R0x-8{{S{
zMyoZum>Z39n^CHq9i^eFFX3uw+3wV^Gb=e+GNPL0zup;QV=&hByczaOcf;d&4wjW<
zjHRu)VS(?xOnb_|gYoAl)}6mGgRgptI`bh1XZ?D$&TC_eg592q|HJ1+c9YC2rygFT
z*PtGN(+j*)tJm&MmDd-$bPa3brQ34V8#I=w%eSr*Wz9~kjmifLr*&c(W*<qhG)^Hl
md*5+sY$#3E7S%i0xRURJr<b?CFTMw8b^1xU))38RQ@jP*hiUu(

diff --git a/extensions/molecule/token/replaced/cleanup.yml b/extensions/molecule/token/replaced/cleanup.yml
deleted file mode 100644
index 85a95bc1..00000000
--- a/extensions/molecule/token/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — token (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove Alpha token (test teardown)
-      ansible.platform.token:
-        config:
-          - description: "Alpha token"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/token/check/cleanup.yml b/extensions/molecule/tokens/check/cleanup.yml
similarity index 86%
rename from extensions/molecule/token/check/cleanup.yml
rename to extensions/molecule/tokens/check/cleanup.yml
index 40d240fd..0dc6217d 100644
--- a/extensions/molecule/token/check/cleanup.yml
+++ b/extensions/molecule/tokens/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — token (check)"
+- name: "Cleanup — tokens (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove Alpha token (test teardown)
-      ansible.platform.token:
+      ansible.platform.tokens:
         config:
           - description: "Alpha token"
         state: deleted
diff --git a/extensions/molecule/token/check/converge.yml b/extensions/molecule/tokens/check/converge.yml
similarity index 87%
rename from extensions/molecule/token/check/converge.yml
rename to extensions/molecule/tokens/check/converge.yml
index ebc24743..b58ba72c 100644
--- a/extensions/molecule/token/check/converge.yml
+++ b/extensions/molecule/tokens/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (check)"
+- name: "Converge — tokens (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=merged
-      ansible.platform.token:
+    - name: Run ansible.platform.tokens with state=merged
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/token/check/molecule.yml b/extensions/molecule/tokens/check/molecule.yml
similarity index 100%
rename from extensions/molecule/token/check/molecule.yml
rename to extensions/molecule/tokens/check/molecule.yml
diff --git a/extensions/molecule/tokens/check/prepare.yml b/extensions/molecule/tokens/check/prepare.yml
new file mode 100644
index 00000000..98e56b03
--- /dev/null
+++ b/extensions/molecule/tokens/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — tokens (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed tokens as check-mode baseline (prerequisite for check)
+      ansible.platform.tokens:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/token/check/vars.yml b/extensions/molecule/tokens/check/vars.yml
similarity index 100%
rename from extensions/molecule/token/check/vars.yml
rename to extensions/molecule/tokens/check/vars.yml
diff --git a/extensions/molecule/token/check/verify.yml b/extensions/molecule/tokens/check/verify.yml
similarity index 85%
rename from extensions/molecule/token/check/verify.yml
rename to extensions/molecule/tokens/check/verify.yml
index 3fe4a0d9..2de74be0 100644
--- a/extensions/molecule/token/check/verify.yml
+++ b/extensions/molecule/tokens/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (check)"
+- name: "Verify — tokens (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather token (check mode must not have applied changes)
-      ansible.platform.token:
+    - name: Gather tokens (check mode must not have applied changes)
+      ansible.platform.tokens:
         config:
           - description: "{{ expected_config.description }}"
         state: gathered
diff --git a/extensions/molecule/token/deleted/cleanup.yml b/extensions/molecule/tokens/deleted/cleanup.yml
similarity index 86%
rename from extensions/molecule/token/deleted/cleanup.yml
rename to extensions/molecule/tokens/deleted/cleanup.yml
index 386fe984..47b2a266 100644
--- a/extensions/molecule/token/deleted/cleanup.yml
+++ b/extensions/molecule/tokens/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — token (deleted)"
+- name: "Cleanup — tokens (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/token/deleted/converge.yml b/extensions/molecule/tokens/deleted/converge.yml
similarity index 75%
rename from extensions/molecule/token/deleted/converge.yml
rename to extensions/molecule/tokens/deleted/converge.yml
index d7ce7a45..fa0bc7cb 100644
--- a/extensions/molecule/token/deleted/converge.yml
+++ b/extensions/molecule/tokens/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (deleted)"
+- name: "Converge — tokens (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=deleted
-      ansible.platform.token:
+    - name: Run ansible.platform.tokens with state=deleted
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/token/deleted/molecule.yml b/extensions/molecule/tokens/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/token/deleted/molecule.yml
rename to extensions/molecule/tokens/deleted/molecule.yml
diff --git a/extensions/molecule/team/replaced/prepare.yml b/extensions/molecule/tokens/deleted/prepare.yml
similarity index 73%
rename from extensions/molecule/team/replaced/prepare.yml
rename to extensions/molecule/tokens/deleted/prepare.yml
index a1ad16e7..8f3b6f46 100644
--- a/extensions/molecule/team/replaced/prepare.yml
+++ b/extensions/molecule/tokens/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — team (replaced)"
+- name: "Prepare — tokens (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed team to be replaced (prerequisite for replaced)
-      ansible.platform.team:
+    - name: Seed tokens to be deleted (prerequisite for deleted)
+      ansible.platform.tokens:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/token/deleted/vars.yml b/extensions/molecule/tokens/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/token/deleted/vars.yml
rename to extensions/molecule/tokens/deleted/vars.yml
diff --git a/extensions/molecule/token/deleted/verify.yml b/extensions/molecule/tokens/deleted/verify.yml
similarity index 84%
rename from extensions/molecule/token/deleted/verify.yml
rename to extensions/molecule/tokens/deleted/verify.yml
index c0f4f7cf..0fd99d3f 100644
--- a/extensions/molecule/token/deleted/verify.yml
+++ b/extensions/molecule/tokens/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (deleted)"
+- name: "Verify — tokens (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather token (should be absent after deleted)
-      ansible.platform.token:
+    - name: Gather tokens (should be absent after deleted)
+      ansible.platform.tokens:
         config:
           - description: "Alpha token"
         state: gathered
diff --git a/extensions/molecule/token/merged/cleanup.yml b/extensions/molecule/tokens/gathered/cleanup.yml
similarity index 86%
rename from extensions/molecule/token/merged/cleanup.yml
rename to extensions/molecule/tokens/gathered/cleanup.yml
index 1828a4fa..718511f4 100644
--- a/extensions/molecule/token/merged/cleanup.yml
+++ b/extensions/molecule/tokens/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — token (merged)"
+- name: "Cleanup — tokens (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove Alpha token (test teardown)
-      ansible.platform.token:
+      ansible.platform.tokens:
         config:
           - description: "Alpha token"
         state: deleted
diff --git a/extensions/molecule/route/gathered/converge.yml b/extensions/molecule/tokens/gathered/converge.yml
similarity index 75%
rename from extensions/molecule/route/gathered/converge.yml
rename to extensions/molecule/tokens/gathered/converge.yml
index 0e2fd82a..2364d8f8 100644
--- a/extensions/molecule/route/gathered/converge.yml
+++ b/extensions/molecule/tokens/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — route (gathered)"
+- name: "Converge — tokens (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.route with state=gathered
-      ansible.platform.route:
+    - name: Run ansible.platform.tokens with state=gathered
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/token/gathered/molecule.yml b/extensions/molecule/tokens/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/token/gathered/molecule.yml
rename to extensions/molecule/tokens/gathered/molecule.yml
diff --git a/extensions/molecule/tokens/gathered/prepare.yml b/extensions/molecule/tokens/gathered/prepare.yml
new file mode 100644
index 00000000..6768fd6d
--- /dev/null
+++ b/extensions/molecule/tokens/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — tokens (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed tokens to be gathered (prerequisite for gathered)
+      ansible.platform.tokens:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/token/gathered/vars.yml b/extensions/molecule/tokens/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/token/gathered/vars.yml
rename to extensions/molecule/tokens/gathered/vars.yml
diff --git a/extensions/molecule/token/gathered/verify.yml b/extensions/molecule/tokens/gathered/verify.yml
similarity index 84%
rename from extensions/molecule/token/gathered/verify.yml
rename to extensions/molecule/tokens/gathered/verify.yml
index abd5008e..962f426c 100644
--- a/extensions/molecule/token/gathered/verify.yml
+++ b/extensions/molecule/tokens/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (gathered)"
+- name: "Verify — tokens (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather token (assert present after gathered)
-      ansible.platform.token:
+    - name: Gather tokens (assert present after gathered)
+      ansible.platform.tokens:
         config:
           - description: "{{ expected_config.description }}"
         state: gathered
diff --git a/extensions/molecule/token/inventory.yml b/extensions/molecule/tokens/inventory.yml
similarity index 100%
rename from extensions/molecule/token/inventory.yml
rename to extensions/molecule/tokens/inventory.yml
diff --git a/extensions/molecule/token/gathered/cleanup.yml b/extensions/molecule/tokens/merged/cleanup.yml
similarity index 86%
rename from extensions/molecule/token/gathered/cleanup.yml
rename to extensions/molecule/tokens/merged/cleanup.yml
index 8189b65c..75004636 100644
--- a/extensions/molecule/token/gathered/cleanup.yml
+++ b/extensions/molecule/tokens/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — token (gathered)"
+- name: "Cleanup — tokens (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove Alpha token (test teardown)
-      ansible.platform.token:
+      ansible.platform.tokens:
         config:
           - description: "Alpha token"
         state: deleted
diff --git a/extensions/molecule/token/merged/converge.yml b/extensions/molecule/tokens/merged/converge.yml
similarity index 75%
rename from extensions/molecule/token/merged/converge.yml
rename to extensions/molecule/tokens/merged/converge.yml
index 71ca6781..e92fcaae 100644
--- a/extensions/molecule/token/merged/converge.yml
+++ b/extensions/molecule/tokens/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (merged)"
+- name: "Converge — tokens (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=merged
-      ansible.platform.token:
+    - name: Run ansible.platform.tokens with state=merged
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/token/merged/molecule.yml b/extensions/molecule/tokens/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/token/merged/molecule.yml
rename to extensions/molecule/tokens/merged/molecule.yml
diff --git a/extensions/molecule/token/merged/vars.yml b/extensions/molecule/tokens/merged/vars.yml
similarity index 100%
rename from extensions/molecule/token/merged/vars.yml
rename to extensions/molecule/tokens/merged/vars.yml
diff --git a/extensions/molecule/token/merged/verify.yml b/extensions/molecule/tokens/merged/verify.yml
similarity index 84%
rename from extensions/molecule/token/merged/verify.yml
rename to extensions/molecule/tokens/merged/verify.yml
index 13d87223..79fab4e8 100644
--- a/extensions/molecule/token/merged/verify.yml
+++ b/extensions/molecule/tokens/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (merged)"
+- name: "Verify — tokens (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather token (assert present after merged)
-      ansible.platform.token:
+    - name: Gather tokens (assert present after merged)
+      ansible.platform.tokens:
         config:
           - description: "{{ expected_config.description }}"
         state: gathered
diff --git a/extensions/molecule/tokens/overridden/cleanup.yml b/extensions/molecule/tokens/overridden/cleanup.yml
new file mode 100644
index 00000000..ba4e2644
--- /dev/null
+++ b/extensions/molecule/tokens/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — tokens (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove Alpha token (test teardown)
+      ansible.platform.tokens:
+        config:
+          - description: "Alpha token"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/token/overridden/converge.yml b/extensions/molecule/tokens/overridden/converge.yml
similarity index 74%
rename from extensions/molecule/token/overridden/converge.yml
rename to extensions/molecule/tokens/overridden/converge.yml
index 691328f9..fd18bc23 100644
--- a/extensions/molecule/token/overridden/converge.yml
+++ b/extensions/molecule/tokens/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (overridden)"
+- name: "Converge — tokens (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=overridden
-      ansible.platform.token:
+    - name: Run ansible.platform.tokens with state=overridden
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/token/overridden/molecule.yml b/extensions/molecule/tokens/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/token/overridden/molecule.yml
rename to extensions/molecule/tokens/overridden/molecule.yml
diff --git a/extensions/molecule/token/overridden/prepare.yml b/extensions/molecule/tokens/overridden/prepare.yml
similarity index 86%
rename from extensions/molecule/token/overridden/prepare.yml
rename to extensions/molecule/tokens/overridden/prepare.yml
index 5d1c86a5..282e9ebc 100644
--- a/extensions/molecule/token/overridden/prepare.yml
+++ b/extensions/molecule/tokens/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — token (overridden)"
+- name: "Prepare — tokens (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.token:
+      ansible.platform.tokens:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/token/overridden/vars.yml b/extensions/molecule/tokens/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/token/overridden/vars.yml
rename to extensions/molecule/tokens/overridden/vars.yml
diff --git a/extensions/molecule/token/overridden/verify.yml b/extensions/molecule/tokens/overridden/verify.yml
similarity index 88%
rename from extensions/molecule/token/overridden/verify.yml
rename to extensions/molecule/tokens/overridden/verify.yml
index 99700703..a90ea055 100644
--- a/extensions/molecule/token/overridden/verify.yml
+++ b/extensions/molecule/tokens/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (overridden)"
+- name: "Verify — tokens (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all token resources (verify overridden final state)
-      ansible.platform.token:
+    - name: Gather all tokens resources (verify overridden final state)
+      ansible.platform.tokens:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/token/overridden/cleanup.yml b/extensions/molecule/tokens/replaced/cleanup.yml
similarity index 86%
rename from extensions/molecule/token/overridden/cleanup.yml
rename to extensions/molecule/tokens/replaced/cleanup.yml
index 8bb05898..bd20c215 100644
--- a/extensions/molecule/token/overridden/cleanup.yml
+++ b/extensions/molecule/tokens/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — token (overridden)"
+- name: "Cleanup — tokens (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove Alpha token (test teardown)
-      ansible.platform.token:
+      ansible.platform.tokens:
         config:
           - description: "Alpha token"
         state: deleted
diff --git a/extensions/molecule/team/replaced/converge.yml b/extensions/molecule/tokens/replaced/converge.yml
similarity index 75%
rename from extensions/molecule/team/replaced/converge.yml
rename to extensions/molecule/tokens/replaced/converge.yml
index 092e3fc3..6a768e19 100644
--- a/extensions/molecule/team/replaced/converge.yml
+++ b/extensions/molecule/tokens/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (replaced)"
+- name: "Converge — tokens (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=replaced
-      ansible.platform.team:
+    - name: Run ansible.platform.tokens with state=replaced
+      ansible.platform.tokens:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/token/replaced/molecule.yml b/extensions/molecule/tokens/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/token/replaced/molecule.yml
rename to extensions/molecule/tokens/replaced/molecule.yml
diff --git a/extensions/molecule/tokens/replaced/prepare.yml b/extensions/molecule/tokens/replaced/prepare.yml
new file mode 100644
index 00000000..ac59bd62
--- /dev/null
+++ b/extensions/molecule/tokens/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — tokens (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed tokens to be replaced (prerequisite for replaced)
+      ansible.platform.tokens:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/token/replaced/vars.yml b/extensions/molecule/tokens/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/token/replaced/vars.yml
rename to extensions/molecule/tokens/replaced/vars.yml
diff --git a/extensions/molecule/token/replaced/verify.yml b/extensions/molecule/tokens/replaced/verify.yml
similarity index 88%
rename from extensions/molecule/token/replaced/verify.yml
rename to extensions/molecule/tokens/replaced/verify.yml
index 3b0397e7..c3024025 100644
--- a/extensions/molecule/token/replaced/verify.yml
+++ b/extensions/molecule/tokens/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — token (replaced)"
+- name: "Verify — tokens (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather token (assert present after replaced)
-      ansible.platform.token:
+    - name: Gather tokens (assert present after replaced)
+      ansible.platform.tokens:
         config:
           - description: "{{ expected_config.description }}"
         state: gathered
diff --git a/extensions/molecule/ui_plugin_route/check/converge.yml b/extensions/molecule/ui_plugin_route/check/converge.yml
deleted file mode 100644
index ec7f6cc9..00000000
--- a/extensions/molecule/ui_plugin_route/check/converge.yml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- name: "Converge — ui_plugin_route (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=merged
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      check_mode: true
-      diff: true
-      register: result
-
-    - name: Assert check mode predicted a change
-      ansible.builtin.assert:
-        that:
-          - result.changed == true
-          - result.before is defined
-          - result.after is defined
-        fail_msg: "check mode should predict a change. got={{ result }}"
-
-    - name: Assert diff output is present
-      ansible.builtin.assert:
-        that:
-          - result.diff is defined
-        fail_msg: "diff output missing from check result"
-      when: result.diff is defined
-
-...
diff --git a/extensions/molecule/ui_plugin_route/check/prepare.yml b/extensions/molecule/ui_plugin_route/check/prepare.yml
deleted file mode 100644
index 012e6fe5..00000000
--- a/extensions/molecule/ui_plugin_route/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — ui_plugin_route (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed ui_plugin_route as check-mode baseline (prerequisite for check)
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/deleted/converge.yml b/extensions/molecule/ui_plugin_route/deleted/converge.yml
deleted file mode 100644
index 6d3174dc..00000000
--- a/extensions/molecule/ui_plugin_route/deleted/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — ui_plugin_route (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=deleted
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/ui_plugin_route/deleted/prepare.yml b/extensions/molecule/ui_plugin_route/deleted/prepare.yml
deleted file mode 100644
index 6f173908..00000000
--- a/extensions/molecule/ui_plugin_route/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — ui_plugin_route (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed ui_plugin_route to be deleted (prerequisite for deleted)
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/gathered/converge.yml b/extensions/molecule/ui_plugin_route/gathered/converge.yml
deleted file mode 100644
index b93ba725..00000000
--- a/extensions/molecule/ui_plugin_route/gathered/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — ui_plugin_route (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=gathered
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/ui_plugin_route/gathered/prepare.yml b/extensions/molecule/ui_plugin_route/gathered/prepare.yml
deleted file mode 100644
index 1058c80f..00000000
--- a/extensions/molecule/ui_plugin_route/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — ui_plugin_route (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed ui_plugin_route to be gathered (prerequisite for gathered)
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/gathered/verify.yml b/extensions/molecule/ui_plugin_route/gathered/verify.yml
deleted file mode 100644
index 8051ba89..00000000
--- a/extensions/molecule/ui_plugin_route/gathered/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — ui_plugin_route (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather ui_plugin_route (assert present after gathered)
-      ansible.platform.ui_plugin_route:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after gathered
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/merged/converge.yml b/extensions/molecule/ui_plugin_route/merged/converge.yml
deleted file mode 100644
index 27552a74..00000000
--- a/extensions/molecule/ui_plugin_route/merged/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — ui_plugin_route (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=merged
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/ui_plugin_route/merged/verify.yml b/extensions/molecule/ui_plugin_route/merged/verify.yml
deleted file mode 100644
index 249f70f0..00000000
--- a/extensions/molecule/ui_plugin_route/merged/verify.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- name: "Verify — ui_plugin_route (merged)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Gather ui_plugin_route (assert present after merged)
-      ansible.platform.ui_plugin_route:
-        config:
-          - name: "{{ expected_config.name }}"
-        state: gathered
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: gathered
-
-    - name: Assert configuration exists after merged
-      ansible.builtin.assert:
-        that:
-          - gathered.gathered is defined
-          - gathered.gathered | length > 0
-        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/overridden/converge.yml b/extensions/molecule/ui_plugin_route/overridden/converge.yml
deleted file mode 100644
index ba8fb903..00000000
--- a/extensions/molecule/ui_plugin_route/overridden/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — ui_plugin_route (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=overridden
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: overridden
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/ui_plugin_route/overridden/prepare.yml b/extensions/molecule/ui_plugin_route/overridden/prepare.yml
deleted file mode 100644
index cff76407..00000000
--- a/extensions/molecule/ui_plugin_route/overridden/prepare.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- name: "Prepare — ui_plugin_route (overridden)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.ui_plugin_route:
-        config: "{{ prepare_configs }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/replaced/cleanup.yml b/extensions/molecule/ui_plugin_route/replaced/cleanup.yml
deleted file mode 100644
index 12d7d0fc..00000000
--- a/extensions/molecule/ui_plugin_route/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — ui_plugin_route (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-uipr-alpha (test teardown)
-      ansible.platform.ui_plugin_route:
-        config:
-          - name: "int-uipr-alpha"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/ui_plugin_route/replaced/converge.yml b/extensions/molecule/ui_plugin_route/replaced/converge.yml
deleted file mode 100644
index b058c777..00000000
--- a/extensions/molecule/ui_plugin_route/replaced/converge.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Converge — ui_plugin_route (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Run ansible.platform.ui_plugin_route with state=replaced
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ expected_config }}"
-        state: replaced
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      register: result
-
-...
diff --git a/extensions/molecule/ui_plugin_route/replaced/prepare.yml b/extensions/molecule/ui_plugin_route/replaced/prepare.yml
deleted file mode 100644
index 55ddc32b..00000000
--- a/extensions/molecule/ui_plugin_route/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — ui_plugin_route (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed ui_plugin_route to be replaced (prerequisite for replaced)
-      ansible.platform.ui_plugin_route:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/ui_plugin_route/check/cleanup.yml b/extensions/molecule/ui_plugin_routes/check/cleanup.yml
similarity index 83%
rename from extensions/molecule/ui_plugin_route/check/cleanup.yml
rename to extensions/molecule/ui_plugin_routes/check/cleanup.yml
index b06b10d8..d59cb807 100644
--- a/extensions/molecule/ui_plugin_route/check/cleanup.yml
+++ b/extensions/molecule/ui_plugin_routes/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ui_plugin_route (check)"
+- name: "Cleanup — ui_plugin_routes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-uipr-alpha (test teardown)
-      ansible.platform.ui_plugin_route:
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "int-uipr-alpha"
         state: deleted
diff --git a/extensions/molecule/ui_plugin_routes/check/converge.yml b/extensions/molecule/ui_plugin_routes/check/converge.yml
new file mode 100644
index 00000000..931dd115
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/check/converge.yml
@@ -0,0 +1,36 @@
+---
+- name: "Converge — ui_plugin_routes (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=merged
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      check_mode: true
+      diff: true
+      register: result
+
+    - name: Assert check mode predicted a change
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.before is defined
+          - result.after is defined
+        fail_msg: "check mode should predict a change. got={{ result }}"
+
+    - name: Assert diff output is present
+      ansible.builtin.assert:
+        that:
+          - result.diff is defined
+        fail_msg: "diff output missing from check result"
+      when: result.diff is defined
+
+...
diff --git a/extensions/molecule/ui_plugin_route/check/molecule.yml b/extensions/molecule/ui_plugin_routes/check/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/check/molecule.yml
rename to extensions/molecule/ui_plugin_routes/check/molecule.yml
diff --git a/extensions/molecule/ui_plugin_routes/check/prepare.yml b/extensions/molecule/ui_plugin_routes/check/prepare.yml
new file mode 100644
index 00000000..6133a197
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/check/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — ui_plugin_routes (check)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed ui_plugin_routes as check-mode baseline (prerequisite for check)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/check/vars.yml b/extensions/molecule/ui_plugin_routes/check/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/check/vars.yml
rename to extensions/molecule/ui_plugin_routes/check/vars.yml
diff --git a/extensions/molecule/ui_plugin_route/check/verify.yml b/extensions/molecule/ui_plugin_routes/check/verify.yml
similarity index 82%
rename from extensions/molecule/ui_plugin_route/check/verify.yml
rename to extensions/molecule/ui_plugin_routes/check/verify.yml
index 3a6c7e84..6e8c6a25 100644
--- a/extensions/molecule/ui_plugin_route/check/verify.yml
+++ b/extensions/molecule/ui_plugin_routes/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ui_plugin_route (check)"
+- name: "Verify — ui_plugin_routes (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ui_plugin_route (check mode must not have applied changes)
-      ansible.platform.ui_plugin_route:
+    - name: Gather ui_plugin_routes (check mode must not have applied changes)
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/ui_plugin_route/deleted/cleanup.yml b/extensions/molecule/ui_plugin_routes/deleted/cleanup.yml
similarity index 84%
rename from extensions/molecule/ui_plugin_route/deleted/cleanup.yml
rename to extensions/molecule/ui_plugin_routes/deleted/cleanup.yml
index a18701e7..97797310 100644
--- a/extensions/molecule/ui_plugin_route/deleted/cleanup.yml
+++ b/extensions/molecule/ui_plugin_routes/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — ui_plugin_route (deleted)"
+- name: "Cleanup — ui_plugin_routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/ui_plugin_routes/deleted/converge.yml b/extensions/molecule/ui_plugin_routes/deleted/converge.yml
new file mode 100644
index 00000000..d15e753a
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/deleted/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — ui_plugin_routes (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=deleted
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/ui_plugin_route/deleted/molecule.yml b/extensions/molecule/ui_plugin_routes/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/deleted/molecule.yml
rename to extensions/molecule/ui_plugin_routes/deleted/molecule.yml
diff --git a/extensions/molecule/ui_plugin_routes/deleted/prepare.yml b/extensions/molecule/ui_plugin_routes/deleted/prepare.yml
new file mode 100644
index 00000000..0af0cddf
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/deleted/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — ui_plugin_routes (deleted)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed ui_plugin_routes to be deleted (prerequisite for deleted)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/deleted/vars.yml b/extensions/molecule/ui_plugin_routes/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/deleted/vars.yml
rename to extensions/molecule/ui_plugin_routes/deleted/vars.yml
diff --git a/extensions/molecule/ui_plugin_route/deleted/verify.yml b/extensions/molecule/ui_plugin_routes/deleted/verify.yml
similarity index 81%
rename from extensions/molecule/ui_plugin_route/deleted/verify.yml
rename to extensions/molecule/ui_plugin_routes/deleted/verify.yml
index b911c400..0649409c 100644
--- a/extensions/molecule/ui_plugin_route/deleted/verify.yml
+++ b/extensions/molecule/ui_plugin_routes/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ui_plugin_route (deleted)"
+- name: "Verify — ui_plugin_routes (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ui_plugin_route (should be absent after deleted)
-      ansible.platform.ui_plugin_route:
+    - name: Gather ui_plugin_routes (should be absent after deleted)
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "int-uipr-alpha"
         state: gathered
diff --git a/extensions/molecule/ui_plugin_route/merged/cleanup.yml b/extensions/molecule/ui_plugin_routes/gathered/cleanup.yml
similarity index 83%
rename from extensions/molecule/ui_plugin_route/merged/cleanup.yml
rename to extensions/molecule/ui_plugin_routes/gathered/cleanup.yml
index d5020ddb..cba2e8c0 100644
--- a/extensions/molecule/ui_plugin_route/merged/cleanup.yml
+++ b/extensions/molecule/ui_plugin_routes/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ui_plugin_route (merged)"
+- name: "Cleanup — ui_plugin_routes (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-uipr-alpha (test teardown)
-      ansible.platform.ui_plugin_route:
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "int-uipr-alpha"
         state: deleted
diff --git a/extensions/molecule/ui_plugin_routes/gathered/converge.yml b/extensions/molecule/ui_plugin_routes/gathered/converge.yml
new file mode 100644
index 00000000..131cd4a6
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/gathered/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — ui_plugin_routes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=gathered
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/ui_plugin_route/gathered/molecule.yml b/extensions/molecule/ui_plugin_routes/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/gathered/molecule.yml
rename to extensions/molecule/ui_plugin_routes/gathered/molecule.yml
diff --git a/extensions/molecule/ui_plugin_routes/gathered/prepare.yml b/extensions/molecule/ui_plugin_routes/gathered/prepare.yml
new file mode 100644
index 00000000..a4cc98bb
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/gathered/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — ui_plugin_routes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed ui_plugin_routes to be gathered (prerequisite for gathered)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/gathered/vars.yml b/extensions/molecule/ui_plugin_routes/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/gathered/vars.yml
rename to extensions/molecule/ui_plugin_routes/gathered/vars.yml
diff --git a/extensions/molecule/ui_plugin_routes/gathered/verify.yml b/extensions/molecule/ui_plugin_routes/gathered/verify.yml
new file mode 100644
index 00000000..1509acc4
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/gathered/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — ui_plugin_routes (gathered)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather ui_plugin_routes (assert present after gathered)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after gathered
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after gathered. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/inventory.yml b/extensions/molecule/ui_plugin_routes/inventory.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/inventory.yml
rename to extensions/molecule/ui_plugin_routes/inventory.yml
diff --git a/extensions/molecule/ui_plugin_route/gathered/cleanup.yml b/extensions/molecule/ui_plugin_routes/merged/cleanup.yml
similarity index 83%
rename from extensions/molecule/ui_plugin_route/gathered/cleanup.yml
rename to extensions/molecule/ui_plugin_routes/merged/cleanup.yml
index 406a051a..8fe21e88 100644
--- a/extensions/molecule/ui_plugin_route/gathered/cleanup.yml
+++ b/extensions/molecule/ui_plugin_routes/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ui_plugin_route (gathered)"
+- name: "Cleanup — ui_plugin_routes (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-uipr-alpha (test teardown)
-      ansible.platform.ui_plugin_route:
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "int-uipr-alpha"
         state: deleted
diff --git a/extensions/molecule/ui_plugin_routes/merged/converge.yml b/extensions/molecule/ui_plugin_routes/merged/converge.yml
new file mode 100644
index 00000000..39b9bfe6
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/merged/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — ui_plugin_routes (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=merged
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/ui_plugin_route/merged/molecule.yml b/extensions/molecule/ui_plugin_routes/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/merged/molecule.yml
rename to extensions/molecule/ui_plugin_routes/merged/molecule.yml
diff --git a/extensions/molecule/ui_plugin_route/merged/vars.yml b/extensions/molecule/ui_plugin_routes/merged/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/merged/vars.yml
rename to extensions/molecule/ui_plugin_routes/merged/vars.yml
diff --git a/extensions/molecule/ui_plugin_routes/merged/verify.yml b/extensions/molecule/ui_plugin_routes/merged/verify.yml
new file mode 100644
index 00000000..2c6312bc
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/merged/verify.yml
@@ -0,0 +1,26 @@
+---
+- name: "Verify — ui_plugin_routes (merged)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Gather ui_plugin_routes (assert present after merged)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - name: "{{ expected_config.name }}"
+        state: gathered
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: gathered
+
+    - name: Assert configuration exists after merged
+      ansible.builtin.assert:
+        that:
+          - gathered.gathered is defined
+          - gathered.gathered | length > 0
+        fail_msg: "Expected resource after merged. got: {{ gathered.gathered }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_routes/overridden/cleanup.yml b/extensions/molecule/ui_plugin_routes/overridden/cleanup.yml
new file mode 100644
index 00000000..cb35cf7a
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — ui_plugin_routes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-uipr-alpha (test teardown)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - name: "int-uipr-alpha"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/ui_plugin_routes/overridden/converge.yml b/extensions/molecule/ui_plugin_routes/overridden/converge.yml
new file mode 100644
index 00000000..12f44708
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/overridden/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — ui_plugin_routes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=overridden
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: overridden
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/ui_plugin_route/overridden/molecule.yml b/extensions/molecule/ui_plugin_routes/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/overridden/molecule.yml
rename to extensions/molecule/ui_plugin_routes/overridden/molecule.yml
diff --git a/extensions/molecule/ui_plugin_routes/overridden/prepare.yml b/extensions/molecule/ui_plugin_routes/overridden/prepare.yml
new file mode 100644
index 00000000..a016a975
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/overridden/prepare.yml
@@ -0,0 +1,17 @@
+---
+- name: "Prepare — ui_plugin_routes (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
+      ansible.platform.ui_plugin_routes:
+        config: "{{ prepare_configs }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/overridden/vars.yml b/extensions/molecule/ui_plugin_routes/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/overridden/vars.yml
rename to extensions/molecule/ui_plugin_routes/overridden/vars.yml
diff --git a/extensions/molecule/ui_plugin_route/overridden/verify.yml b/extensions/molecule/ui_plugin_routes/overridden/verify.yml
similarity index 86%
rename from extensions/molecule/ui_plugin_route/overridden/verify.yml
rename to extensions/molecule/ui_plugin_routes/overridden/verify.yml
index 73dc22d5..142d3d41 100644
--- a/extensions/molecule/ui_plugin_route/overridden/verify.yml
+++ b/extensions/molecule/ui_plugin_routes/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ui_plugin_route (overridden)"
+- name: "Verify — ui_plugin_routes (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all ui_plugin_route resources (verify overridden final state)
-      ansible.platform.ui_plugin_route:
+    - name: Gather all ui_plugin_routes resources (verify overridden final state)
+      ansible.platform.ui_plugin_routes:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/ui_plugin_route/overridden/cleanup.yml b/extensions/molecule/ui_plugin_routes/replaced/cleanup.yml
similarity index 83%
rename from extensions/molecule/ui_plugin_route/overridden/cleanup.yml
rename to extensions/molecule/ui_plugin_routes/replaced/cleanup.yml
index 4d78fff4..7e07a810 100644
--- a/extensions/molecule/ui_plugin_route/overridden/cleanup.yml
+++ b/extensions/molecule/ui_plugin_routes/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — ui_plugin_route (overridden)"
+- name: "Cleanup — ui_plugin_routes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-uipr-alpha (test teardown)
-      ansible.platform.ui_plugin_route:
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "int-uipr-alpha"
         state: deleted
diff --git a/extensions/molecule/ui_plugin_routes/replaced/converge.yml b/extensions/molecule/ui_plugin_routes/replaced/converge.yml
new file mode 100644
index 00000000..42157c23
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/replaced/converge.yml
@@ -0,0 +1,19 @@
+---
+- name: "Converge — ui_plugin_routes (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Run ansible.platform.ui_plugin_routes with state=replaced
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ expected_config }}"
+        state: replaced
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      register: result
+
+...
diff --git a/extensions/molecule/ui_plugin_route/replaced/molecule.yml b/extensions/molecule/ui_plugin_routes/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/replaced/molecule.yml
rename to extensions/molecule/ui_plugin_routes/replaced/molecule.yml
diff --git a/extensions/molecule/ui_plugin_routes/replaced/prepare.yml b/extensions/molecule/ui_plugin_routes/replaced/prepare.yml
new file mode 100644
index 00000000..f7461f42
--- /dev/null
+++ b/extensions/molecule/ui_plugin_routes/replaced/prepare.yml
@@ -0,0 +1,18 @@
+---
+- name: "Prepare — ui_plugin_routes (replaced)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Seed ui_plugin_routes to be replaced (prerequisite for replaced)
+      ansible.platform.ui_plugin_routes:
+        config:
+          - "{{ prepare_config }}"
+        state: merged
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+
+...
diff --git a/extensions/molecule/ui_plugin_route/replaced/vars.yml b/extensions/molecule/ui_plugin_routes/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/ui_plugin_route/replaced/vars.yml
rename to extensions/molecule/ui_plugin_routes/replaced/vars.yml
diff --git a/extensions/molecule/ui_plugin_route/replaced/verify.yml b/extensions/molecule/ui_plugin_routes/replaced/verify.yml
similarity index 86%
rename from extensions/molecule/ui_plugin_route/replaced/verify.yml
rename to extensions/molecule/ui_plugin_routes/replaced/verify.yml
index eb57e691..c42baf78 100644
--- a/extensions/molecule/ui_plugin_route/replaced/verify.yml
+++ b/extensions/molecule/ui_plugin_routes/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — ui_plugin_route (replaced)"
+- name: "Verify — ui_plugin_routes (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather ui_plugin_route (assert present after replaced)
-      ansible.platform.ui_plugin_route:
+    - name: Gather ui_plugin_routes (assert present after replaced)
+      ansible.platform.ui_plugin_routes:
         config:
           - name: "{{ expected_config.name }}"
         state: gathered
diff --git a/extensions/molecule/user/check/prepare.yml b/extensions/molecule/user/check/prepare.yml
deleted file mode 100644
index fca7a449..00000000
--- a/extensions/molecule/user/check/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — user (check)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed user as check-mode baseline (prerequisite for check)
-      ansible.platform.user:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/user/deleted/prepare.yml b/extensions/molecule/user/deleted/prepare.yml
deleted file mode 100644
index e800c7e9..00000000
--- a/extensions/molecule/user/deleted/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — user (deleted)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed user to be deleted (prerequisite for deleted)
-      ansible.platform.user:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/user/gathered/prepare.yml b/extensions/molecule/user/gathered/prepare.yml
deleted file mode 100644
index db825849..00000000
--- a/extensions/molecule/user/gathered/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — user (gathered)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed user to be gathered (prerequisite for gathered)
-      ansible.platform.user:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/user/replaced/cleanup.yml b/extensions/molecule/user/replaced/cleanup.yml
deleted file mode 100644
index 4a49d896..00000000
--- a/extensions/molecule/user/replaced/cleanup.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: "Cleanup — user (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Remove int-user-alice (test teardown)
-      ansible.platform.user:
-        config:
-          - username: "int-user-alice"
-        state: deleted
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-      failed_when: false
-
-...
diff --git a/extensions/molecule/user/replaced/prepare.yml b/extensions/molecule/user/replaced/prepare.yml
deleted file mode 100644
index 63dc64f1..00000000
--- a/extensions/molecule/user/replaced/prepare.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-- name: "Prepare — user (replaced)"
-  hosts: localhost
-  gather_facts: false
-  vars_files:
-    - vars.yml
-  tasks:
-    - name: Seed user to be replaced (prerequisite for replaced)
-      ansible.platform.user:
-        config:
-          - "{{ prepare_config }}"
-        state: merged
-        gateway_hostname: "{{ gateway_hostname }}"
-        gateway_username: "{{ gateway_username }}"
-        gateway_password: "{{ gateway_password }}"
-        gateway_validate_certs: "{{ gateway_validate_certs }}"
-
-...
diff --git a/extensions/molecule/user/check/cleanup.yml b/extensions/molecule/users/check/cleanup.yml
similarity index 87%
rename from extensions/molecule/user/check/cleanup.yml
rename to extensions/molecule/users/check/cleanup.yml
index 82e28f86..1fc401bd 100644
--- a/extensions/molecule/user/check/cleanup.yml
+++ b/extensions/molecule/users/check/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — user (check)"
+- name: "Cleanup — users (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-user-alice (test teardown)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "int-user-alice"
         state: deleted
diff --git a/extensions/molecule/team/check/converge.yml b/extensions/molecule/users/check/converge.yml
similarity index 88%
rename from extensions/molecule/team/check/converge.yml
rename to extensions/molecule/users/check/converge.yml
index 1c0e6188..38d59829 100644
--- a/extensions/molecule/team/check/converge.yml
+++ b/extensions/molecule/users/check/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (check)"
+- name: "Converge — users (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=merged
-      ansible.platform.team:
+    - name: Run ansible.platform.users with state=merged
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/user/check/molecule.yml b/extensions/molecule/users/check/molecule.yml
similarity index 100%
rename from extensions/molecule/user/check/molecule.yml
rename to extensions/molecule/users/check/molecule.yml
diff --git a/extensions/molecule/route/check/prepare.yml b/extensions/molecule/users/check/prepare.yml
similarity index 74%
rename from extensions/molecule/route/check/prepare.yml
rename to extensions/molecule/users/check/prepare.yml
index 3b27eccd..7f69e9e6 100644
--- a/extensions/molecule/route/check/prepare.yml
+++ b/extensions/molecule/users/check/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — route (check)"
+- name: "Prepare — users (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed route as check-mode baseline (prerequisite for check)
-      ansible.platform.route:
+    - name: Seed users as check-mode baseline (prerequisite for check)
+      ansible.platform.users:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/user/check/vars.yml b/extensions/molecule/users/check/vars.yml
similarity index 100%
rename from extensions/molecule/user/check/vars.yml
rename to extensions/molecule/users/check/vars.yml
diff --git a/extensions/molecule/user/check/verify.yml b/extensions/molecule/users/check/verify.yml
similarity index 85%
rename from extensions/molecule/user/check/verify.yml
rename to extensions/molecule/users/check/verify.yml
index 69d5d34c..7c96ee17 100644
--- a/extensions/molecule/user/check/verify.yml
+++ b/extensions/molecule/users/check/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (check)"
+- name: "Verify — users (check)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather user (check mode must not have applied changes)
-      ansible.platform.user:
+    - name: Gather users (check mode must not have applied changes)
+      ansible.platform.users:
         config:
           - username: "{{ expected_config.username }}"
         state: gathered
diff --git a/extensions/molecule/user/deleted/cleanup.yml b/extensions/molecule/users/deleted/cleanup.yml
similarity index 87%
rename from extensions/molecule/user/deleted/cleanup.yml
rename to extensions/molecule/users/deleted/cleanup.yml
index fef21316..c63739f7 100644
--- a/extensions/molecule/user/deleted/cleanup.yml
+++ b/extensions/molecule/users/deleted/cleanup.yml
@@ -1,5 +1,5 @@
 ---
-- name: "Cleanup — user (deleted)"
+- name: "Cleanup — users (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
diff --git a/extensions/molecule/team/deleted/converge.yml b/extensions/molecule/users/deleted/converge.yml
similarity index 75%
rename from extensions/molecule/team/deleted/converge.yml
rename to extensions/molecule/users/deleted/converge.yml
index d1333388..4f246505 100644
--- a/extensions/molecule/team/deleted/converge.yml
+++ b/extensions/molecule/users/deleted/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — team (deleted)"
+- name: "Converge — users (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.team with state=deleted
-      ansible.platform.team:
+    - name: Run ansible.platform.users with state=deleted
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: deleted
diff --git a/extensions/molecule/user/deleted/molecule.yml b/extensions/molecule/users/deleted/molecule.yml
similarity index 100%
rename from extensions/molecule/user/deleted/molecule.yml
rename to extensions/molecule/users/deleted/molecule.yml
diff --git a/extensions/molecule/route/deleted/prepare.yml b/extensions/molecule/users/deleted/prepare.yml
similarity index 74%
rename from extensions/molecule/route/deleted/prepare.yml
rename to extensions/molecule/users/deleted/prepare.yml
index 8c032a8c..98926f24 100644
--- a/extensions/molecule/route/deleted/prepare.yml
+++ b/extensions/molecule/users/deleted/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — route (deleted)"
+- name: "Prepare — users (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed route to be deleted (prerequisite for deleted)
-      ansible.platform.route:
+    - name: Seed users to be deleted (prerequisite for deleted)
+      ansible.platform.users:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/user/deleted/vars.yml b/extensions/molecule/users/deleted/vars.yml
similarity index 100%
rename from extensions/molecule/user/deleted/vars.yml
rename to extensions/molecule/users/deleted/vars.yml
diff --git a/extensions/molecule/user/deleted/verify.yml b/extensions/molecule/users/deleted/verify.yml
similarity index 84%
rename from extensions/molecule/user/deleted/verify.yml
rename to extensions/molecule/users/deleted/verify.yml
index 665491ac..df38d957 100644
--- a/extensions/molecule/user/deleted/verify.yml
+++ b/extensions/molecule/users/deleted/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (deleted)"
+- name: "Verify — users (deleted)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather user (should be absent after deleted)
-      ansible.platform.user:
+    - name: Gather users (should be absent after deleted)
+      ansible.platform.users:
         config:
           - username: "int-user-alice"
         state: gathered
diff --git a/extensions/molecule/user/merged/cleanup.yml b/extensions/molecule/users/gathered/cleanup.yml
similarity index 86%
rename from extensions/molecule/user/merged/cleanup.yml
rename to extensions/molecule/users/gathered/cleanup.yml
index 530ffebb..d3693f1a 100644
--- a/extensions/molecule/user/merged/cleanup.yml
+++ b/extensions/molecule/users/gathered/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — user (merged)"
+- name: "Cleanup — users (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-user-alice (test teardown)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "int-user-alice"
         state: deleted
diff --git a/extensions/molecule/token/gathered/converge.yml b/extensions/molecule/users/gathered/converge.yml
similarity index 75%
rename from extensions/molecule/token/gathered/converge.yml
rename to extensions/molecule/users/gathered/converge.yml
index b916faac..96b502ac 100644
--- a/extensions/molecule/token/gathered/converge.yml
+++ b/extensions/molecule/users/gathered/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (gathered)"
+- name: "Converge — users (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=gathered
-      ansible.platform.token:
+    - name: Run ansible.platform.users with state=gathered
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: gathered
diff --git a/extensions/molecule/user/gathered/molecule.yml b/extensions/molecule/users/gathered/molecule.yml
similarity index 100%
rename from extensions/molecule/user/gathered/molecule.yml
rename to extensions/molecule/users/gathered/molecule.yml
diff --git a/extensions/molecule/token/replaced/prepare.yml b/extensions/molecule/users/gathered/prepare.yml
similarity index 74%
rename from extensions/molecule/token/replaced/prepare.yml
rename to extensions/molecule/users/gathered/prepare.yml
index 7aef514d..92904d59 100644
--- a/extensions/molecule/token/replaced/prepare.yml
+++ b/extensions/molecule/users/gathered/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — token (replaced)"
+- name: "Prepare — users (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed token to be replaced (prerequisite for replaced)
-      ansible.platform.token:
+    - name: Seed users to be gathered (prerequisite for gathered)
+      ansible.platform.users:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/user/gathered/vars.yml b/extensions/molecule/users/gathered/vars.yml
similarity index 100%
rename from extensions/molecule/user/gathered/vars.yml
rename to extensions/molecule/users/gathered/vars.yml
diff --git a/extensions/molecule/user/gathered/verify.yml b/extensions/molecule/users/gathered/verify.yml
similarity index 84%
rename from extensions/molecule/user/gathered/verify.yml
rename to extensions/molecule/users/gathered/verify.yml
index 65aacb77..3e5fd25a 100644
--- a/extensions/molecule/user/gathered/verify.yml
+++ b/extensions/molecule/users/gathered/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (gathered)"
+- name: "Verify — users (gathered)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather user (assert present after gathered)
-      ansible.platform.user:
+    - name: Gather users (assert present after gathered)
+      ansible.platform.users:
         config:
           - username: "{{ expected_config.username }}"
         state: gathered
diff --git a/extensions/molecule/user/inventory.yml b/extensions/molecule/users/inventory.yml
similarity index 100%
rename from extensions/molecule/user/inventory.yml
rename to extensions/molecule/users/inventory.yml
diff --git a/extensions/molecule/user/gathered/cleanup.yml b/extensions/molecule/users/merged/cleanup.yml
similarity index 87%
rename from extensions/molecule/user/gathered/cleanup.yml
rename to extensions/molecule/users/merged/cleanup.yml
index bd5a4dfb..a6a183d7 100644
--- a/extensions/molecule/user/gathered/cleanup.yml
+++ b/extensions/molecule/users/merged/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — user (gathered)"
+- name: "Cleanup — users (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-user-alice (test teardown)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "int-user-alice"
         state: deleted
diff --git a/extensions/molecule/user/merged/converge.yml b/extensions/molecule/users/merged/converge.yml
similarity index 76%
rename from extensions/molecule/user/merged/converge.yml
rename to extensions/molecule/users/merged/converge.yml
index 8b50056b..999dc194 100644
--- a/extensions/molecule/user/merged/converge.yml
+++ b/extensions/molecule/users/merged/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (merged)"
+- name: "Converge — users (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=merged
-      ansible.platform.user:
+    - name: Run ansible.platform.users with state=merged
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: merged
diff --git a/extensions/molecule/user/merged/molecule.yml b/extensions/molecule/users/merged/molecule.yml
similarity index 100%
rename from extensions/molecule/user/merged/molecule.yml
rename to extensions/molecule/users/merged/molecule.yml
diff --git a/extensions/molecule/user/merged/vars.yml b/extensions/molecule/users/merged/vars.yml
similarity index 100%
rename from extensions/molecule/user/merged/vars.yml
rename to extensions/molecule/users/merged/vars.yml
diff --git a/extensions/molecule/user/merged/verify.yml b/extensions/molecule/users/merged/verify.yml
similarity index 85%
rename from extensions/molecule/user/merged/verify.yml
rename to extensions/molecule/users/merged/verify.yml
index 097c215f..2a436905 100644
--- a/extensions/molecule/user/merged/verify.yml
+++ b/extensions/molecule/users/merged/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (merged)"
+- name: "Verify — users (merged)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather user (assert present after merged)
-      ansible.platform.user:
+    - name: Gather users (assert present after merged)
+      ansible.platform.users:
         config:
           - username: "{{ expected_config.username }}"
         state: gathered
diff --git a/extensions/molecule/users/overridden/cleanup.yml b/extensions/molecule/users/overridden/cleanup.yml
new file mode 100644
index 00000000..412d5500
--- /dev/null
+++ b/extensions/molecule/users/overridden/cleanup.yml
@@ -0,0 +1,19 @@
+---
+- name: "Cleanup — users (overridden)"
+  hosts: localhost
+  gather_facts: false
+  vars_files:
+    - vars.yml
+  tasks:
+    - name: Remove int-user-alice (test teardown)
+      ansible.platform.users:
+        config:
+          - username: "int-user-alice"
+        state: deleted
+        gateway_hostname: "{{ gateway_hostname }}"
+        gateway_username: "{{ gateway_username }}"
+        gateway_password: "{{ gateway_password }}"
+        gateway_validate_certs: "{{ gateway_validate_certs }}"
+      failed_when: false
+
+...
diff --git a/extensions/molecule/user/overridden/converge.yml b/extensions/molecule/users/overridden/converge.yml
similarity index 75%
rename from extensions/molecule/user/overridden/converge.yml
rename to extensions/molecule/users/overridden/converge.yml
index 98fc78f6..f65a10a8 100644
--- a/extensions/molecule/user/overridden/converge.yml
+++ b/extensions/molecule/users/overridden/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — user (overridden)"
+- name: "Converge — users (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.user with state=overridden
-      ansible.platform.user:
+    - name: Run ansible.platform.users with state=overridden
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: overridden
diff --git a/extensions/molecule/user/overridden/molecule.yml b/extensions/molecule/users/overridden/molecule.yml
similarity index 100%
rename from extensions/molecule/user/overridden/molecule.yml
rename to extensions/molecule/users/overridden/molecule.yml
diff --git a/extensions/molecule/route/overridden/prepare.yml b/extensions/molecule/users/overridden/prepare.yml
similarity index 86%
rename from extensions/molecule/route/overridden/prepare.yml
rename to extensions/molecule/users/overridden/prepare.yml
index 68fd15c6..46a9b4e2 100644
--- a/extensions/molecule/route/overridden/prepare.yml
+++ b/extensions/molecule/users/overridden/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — route (overridden)"
+- name: "Prepare — users (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Seed prerequisite resources via merged (r0 + r1 + extras for overridden)
-      ansible.platform.route:
+      ansible.platform.users:
         config: "{{ prepare_configs }}"
         state: merged
         gateway_hostname: "{{ gateway_hostname }}"
diff --git a/extensions/molecule/user/overridden/vars.yml b/extensions/molecule/users/overridden/vars.yml
similarity index 100%
rename from extensions/molecule/user/overridden/vars.yml
rename to extensions/molecule/users/overridden/vars.yml
diff --git a/extensions/molecule/user/overridden/verify.yml b/extensions/molecule/users/overridden/verify.yml
similarity index 88%
rename from extensions/molecule/user/overridden/verify.yml
rename to extensions/molecule/users/overridden/verify.yml
index 050b118b..e834f9c6 100644
--- a/extensions/molecule/user/overridden/verify.yml
+++ b/extensions/molecule/users/overridden/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (overridden)"
+- name: "Verify — users (overridden)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather all user resources (verify overridden final state)
-      ansible.platform.user:
+    - name: Gather all users resources (verify overridden final state)
+      ansible.platform.users:
         state: gathered
         gateway_hostname: "{{ gateway_hostname }}"
         gateway_username: "{{ gateway_username }}"
diff --git a/extensions/molecule/user/overridden/cleanup.yml b/extensions/molecule/users/replaced/cleanup.yml
similarity index 86%
rename from extensions/molecule/user/overridden/cleanup.yml
rename to extensions/molecule/users/replaced/cleanup.yml
index 6e9784cf..ded38f8b 100644
--- a/extensions/molecule/user/overridden/cleanup.yml
+++ b/extensions/molecule/users/replaced/cleanup.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Cleanup — user (overridden)"
+- name: "Cleanup — users (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
     - name: Remove int-user-alice (test teardown)
-      ansible.platform.user:
+      ansible.platform.users:
         config:
           - username: "int-user-alice"
         state: deleted
diff --git a/extensions/molecule/token/replaced/converge.yml b/extensions/molecule/users/replaced/converge.yml
similarity index 75%
rename from extensions/molecule/token/replaced/converge.yml
rename to extensions/molecule/users/replaced/converge.yml
index f51c0ac2..eff53ca5 100644
--- a/extensions/molecule/token/replaced/converge.yml
+++ b/extensions/molecule/users/replaced/converge.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Converge — token (replaced)"
+- name: "Converge — users (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Run ansible.platform.token with state=replaced
-      ansible.platform.token:
+    - name: Run ansible.platform.users with state=replaced
+      ansible.platform.users:
         config:
           - "{{ expected_config }}"
         state: replaced
diff --git a/extensions/molecule/user/replaced/molecule.yml b/extensions/molecule/users/replaced/molecule.yml
similarity index 100%
rename from extensions/molecule/user/replaced/molecule.yml
rename to extensions/molecule/users/replaced/molecule.yml
diff --git a/extensions/molecule/route/gathered/prepare.yml b/extensions/molecule/users/replaced/prepare.yml
similarity index 74%
rename from extensions/molecule/route/gathered/prepare.yml
rename to extensions/molecule/users/replaced/prepare.yml
index c9e42ef3..1cbe0218 100644
--- a/extensions/molecule/route/gathered/prepare.yml
+++ b/extensions/molecule/users/replaced/prepare.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Prepare — route (gathered)"
+- name: "Prepare — users (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Seed route to be gathered (prerequisite for gathered)
-      ansible.platform.route:
+    - name: Seed users to be replaced (prerequisite for replaced)
+      ansible.platform.users:
         config:
           - "{{ prepare_config }}"
         state: merged
diff --git a/extensions/molecule/user/replaced/vars.yml b/extensions/molecule/users/replaced/vars.yml
similarity index 100%
rename from extensions/molecule/user/replaced/vars.yml
rename to extensions/molecule/users/replaced/vars.yml
diff --git a/extensions/molecule/user/replaced/verify.yml b/extensions/molecule/users/replaced/verify.yml
similarity index 88%
rename from extensions/molecule/user/replaced/verify.yml
rename to extensions/molecule/users/replaced/verify.yml
index 20fb3bf8..51917bdb 100644
--- a/extensions/molecule/user/replaced/verify.yml
+++ b/extensions/molecule/users/replaced/verify.yml
@@ -1,12 +1,12 @@
 ---
-- name: "Verify — user (replaced)"
+- name: "Verify — users (replaced)"
   hosts: localhost
   gather_facts: false
   vars_files:
     - vars.yml
   tasks:
-    - name: Gather user (assert present after replaced)
-      ansible.platform.user:
+    - name: Gather users (assert present after replaced)
+      ansible.platform.users:
         config:
           - username: "{{ expected_config.username }}"
         state: gathered
diff --git a/plugins/action/application.py b/plugins/action/applications.py
similarity index 80%
rename from plugins/action/application.py
rename to plugins/action/applications.py
index 9b8e19de..d094ba70 100644
--- a/plugins/action/application.py
+++ b/plugins/action/applications.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.application resource module.
+Action plugin for ansible.platform.applications resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for application."""
+    """Resource module action plugin for applications."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.application.AnsibleApplication"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.applications.AnsibleApplications"
diff --git a/plugins/action/authenticator_user.py b/plugins/action/authenticator_maps.py
similarity index 78%
rename from plugins/action/authenticator_user.py
rename to plugins/action/authenticator_maps.py
index 496f6510..b5112ec8 100644
--- a/plugins/action/authenticator_user.py
+++ b/plugins/action/authenticator_maps.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.authenticator_user resource module.
+Action plugin for ansible.platform.authenticator_maps resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for authenticator_user."""
+    """Resource module action plugin for authenticator_maps."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticator_user.AnsibleAuthenticatorUser"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticator_maps.AnsibleAuthenticatorMaps"
diff --git a/plugins/action/authenticator_map.py b/plugins/action/authenticator_users.py
similarity index 77%
rename from plugins/action/authenticator_map.py
rename to plugins/action/authenticator_users.py
index 3ffd7d09..6bf9e8a1 100644
--- a/plugins/action/authenticator_map.py
+++ b/plugins/action/authenticator_users.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.authenticator_map resource module.
+Action plugin for ansible.platform.authenticator_users resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for authenticator_map."""
+    """Resource module action plugin for authenticator_users."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticator_map.AnsibleAuthenticatorMap"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticator_users.AnsibleAuthenticatorUsers"
diff --git a/plugins/action/authenticator.py b/plugins/action/authenticators.py
similarity index 79%
rename from plugins/action/authenticator.py
rename to plugins/action/authenticators.py
index 14acdd00..064fe140 100644
--- a/plugins/action/authenticator.py
+++ b/plugins/action/authenticators.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.authenticator resource module.
+Action plugin for ansible.platform.authenticators resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for authenticator."""
+    """Resource module action plugin for authenticators."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticator.AnsibleAuthenticator"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.authenticators.AnsibleAuthenticators"
diff --git a/plugins/action/base_action.py b/plugins/action/base_action.py
index e6cf915a..3b5ea6e9 100644
--- a/plugins/action/base_action.py
+++ b/plugins/action/base_action.py
@@ -30,7 +30,7 @@
 
 Subclass contract (minimal):
     class ActionModule(BaseResourceActionPlugin):
-        USER_MODEL = 'plugins.plugin_utils.ansible_models.user.AnsibleUser'
+        USER_MODEL = 'plugins.plugin_utils.ansible_models.users.AnsibleUsers'
 
 Identity categories (see docs/05-design-principles.md):
     Category A: CANONICAL_KEY set, SYSTEM_KEY=None  — user key IS the API key
@@ -44,6 +44,7 @@ class ActionModule(BaseResourceActionPlugin):
 
 import base64
 import importlib
+import importlib.util
 import json
 import subprocess
 import time
@@ -244,7 +245,7 @@ class BaseResourceActionPlugin(ActionBase):
     Subclasses declare the Ansible Model import path:
 
         class ActionModule(BaseResourceActionPlugin):
-            USER_MODEL = 'plugins.plugin_utils.ansible_models.user.AnsibleUser'
+            USER_MODEL = 'plugins.plugin_utils.ansible_models.users.AnsibleUsers'
 
     All resource metadata (MODULE_NAME, SCOPE_PARAM, CANONICAL_KEY, etc.)
     is read from the Ansible Model class at runtime.
@@ -949,13 +950,19 @@ def _get_documentation(self) -> str:
         if not self.MODULE_NAME:
             return ""
 
+        # Module files use plural names (e.g. users.py) while MODULE_NAME is
+        # the singular API endpoint name (e.g. "user"). Derive the file name.
+        module_file_name = (
+            self.MODULE_NAME
+            if self.MODULE_NAME.endswith("s")
+            else self.MODULE_NAME + "s"
+        )
+
         # Primary: file-based discovery relative to this action plugin
-        module_file = Path(__file__).parent.parent / "modules" / f"{self.MODULE_NAME}.py"
+        module_file = Path(__file__).parent.parent / "modules" / f"{module_file_name}.py"
         if module_file.exists():
             try:
-                import importlib.util
-
-                spec = importlib.util.spec_from_file_location(f"module_{self.MODULE_NAME}", module_file)
+                spec = importlib.util.spec_from_file_location(f"module_{module_file_name}", module_file)
                 if spec and spec.loader:
                     mod = importlib.util.module_from_spec(spec)
                     spec.loader.exec_module(mod)
@@ -968,8 +975,8 @@ def _get_documentation(self) -> str:
         # Fallback: standard import
         parent_pkg = type(self).__module__.rsplit(".", 2)[0]  # ...plugins
         for candidate in (
-            f"{parent_pkg}.modules.{self.MODULE_NAME}",
-            f"ansible_collections.ansible.platform.plugins.modules.{self.MODULE_NAME}",
+            f"{parent_pkg}.modules.{module_file_name}",
+            f"ansible_collections.ansible.platform.plugins.modules.{module_file_name}",
         ):
             try:
                 mod = importlib.import_module(candidate)
@@ -1025,8 +1032,6 @@ def _load_documentation_fragment(self, fragment_name: str) -> dict:
             fragment_path = Path(__file__).parent.parent / "doc_fragments" / f"{fragment}.py"
 
             if fragment_path.exists():
-                import importlib.util
-
                 spec = importlib.util.spec_from_file_location(f"doc_fragment_{fragment}", fragment_path)
                 if spec and spec.loader:
                     module = importlib.util.module_from_spec(spec)
diff --git a/plugins/action/ca_certificate.py b/plugins/action/ca_certificates.py
similarity index 78%
rename from plugins/action/ca_certificate.py
rename to plugins/action/ca_certificates.py
index 89096b29..8eb1fa0f 100644
--- a/plugins/action/ca_certificate.py
+++ b/plugins/action/ca_certificates.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.ca_certificate resource module.
+Action plugin for ansible.platform.ca_certificates resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for ca_certificate."""
+    """Resource module action plugin for ca_certificates."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.ca_certificate.AnsibleCaCertificate"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.ca_certificates.AnsibleCaCertificates"
diff --git a/plugins/action/feature_flag.py b/plugins/action/feature_flags.py
similarity index 79%
rename from plugins/action/feature_flag.py
rename to plugins/action/feature_flags.py
index 559ae838..4375c74d 100644
--- a/plugins/action/feature_flag.py
+++ b/plugins/action/feature_flags.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.feature_flag resource module.
+Action plugin for ansible.platform.feature_flags resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for feature_flag."""
+    """Resource module action plugin for feature_flags."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.feature_flag.AnsibleFeatureFlag"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.feature_flags.AnsibleFeatureFlags"
diff --git a/plugins/action/http_port.py b/plugins/action/http_ports.py
similarity index 72%
rename from plugins/action/http_port.py
rename to plugins/action/http_ports.py
index c0d99603..27b16773 100644
--- a/plugins/action/http_port.py
+++ b/plugins/action/http_ports.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.http_port resource module.
+Action plugin for ansible.platform.http_ports resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for http_port."""
+    """Resource module action plugin for http_ports."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.http_port.AnsibleHttpPort"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.http_ports.AnsibleHttpPorts"
diff --git a/plugins/action/organization.py b/plugins/action/organizations.py
similarity index 79%
rename from plugins/action/organization.py
rename to plugins/action/organizations.py
index 47bd5cb1..5241b5a0 100644
--- a/plugins/action/organization.py
+++ b/plugins/action/organizations.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.organization resource module.
+Action plugin for ansible.platform.organizations resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for organization."""
+    """Resource module action plugin for organizations."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.organization.AnsibleOrganization"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.organizations.AnsibleOrganizations"
diff --git a/plugins/action/role_definition.py b/plugins/action/role_definitions.py
similarity index 78%
rename from plugins/action/role_definition.py
rename to plugins/action/role_definitions.py
index 8618c4b5..9ddbb572 100644
--- a/plugins/action/role_definition.py
+++ b/plugins/action/role_definitions.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.role_definition resource module.
+Action plugin for ansible.platform.role_definitions resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for role_definition."""
+    """Resource module action plugin for role_definitions."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.role_definition.AnsibleRoleDefinition"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.role_definitions.AnsibleRoleDefinitions"
diff --git a/plugins/action/role_team_assignment.py b/plugins/action/role_team_assignments.py
similarity index 76%
rename from plugins/action/role_team_assignment.py
rename to plugins/action/role_team_assignments.py
index 7c182114..89dd84bb 100644
--- a/plugins/action/role_team_assignment.py
+++ b/plugins/action/role_team_assignments.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.role_team_assignment resource module.
+Action plugin for ansible.platform.role_team_assignments resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for role_team_assignment."""
+    """Resource module action plugin for role_team_assignments."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.role_team_assignment.AnsibleRoleTeamAssignment"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.role_team_assignments.AnsibleRoleTeamAssignments"
diff --git a/plugins/action/role_user_assignment.py b/plugins/action/role_user_assignments.py
similarity index 76%
rename from plugins/action/role_user_assignment.py
rename to plugins/action/role_user_assignments.py
index 04d001fb..5c00d2e4 100644
--- a/plugins/action/role_user_assignment.py
+++ b/plugins/action/role_user_assignments.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.role_user_assignment resource module.
+Action plugin for ansible.platform.role_user_assignments resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for role_user_assignment."""
+    """Resource module action plugin for role_user_assignments."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.role_user_assignment.AnsibleRoleUserAssignment"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.role_user_assignments.AnsibleRoleUserAssignments"
diff --git a/plugins/action/route.py b/plugins/action/routes.py
similarity index 73%
rename from plugins/action/route.py
rename to plugins/action/routes.py
index 75f13ce2..6e42ce14 100644
--- a/plugins/action/route.py
+++ b/plugins/action/routes.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.route resource module.
+Action plugin for ansible.platform.routes resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for route."""
+    """Resource module action plugin for routes."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.route.AnsibleRoute"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.routes.AnsibleRoutes"
diff --git a/plugins/action/service_cluster.py b/plugins/action/service_clusters.py
similarity index 78%
rename from plugins/action/service_cluster.py
rename to plugins/action/service_clusters.py
index dba7f922..e794bb5f 100644
--- a/plugins/action/service_cluster.py
+++ b/plugins/action/service_clusters.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.service_cluster resource module.
+Action plugin for ansible.platform.service_clusters resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for service_cluster."""
+    """Resource module action plugin for service_clusters."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.service_cluster.AnsibleServiceCluster"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.service_clusters.AnsibleServiceClusters"
diff --git a/plugins/action/service_key.py b/plugins/action/service_keys.py
similarity index 80%
rename from plugins/action/service_key.py
rename to plugins/action/service_keys.py
index acc30006..918c8350 100644
--- a/plugins/action/service_key.py
+++ b/plugins/action/service_keys.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.service_key resource module.
+Action plugin for ansible.platform.service_keys resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for service_key."""
+    """Resource module action plugin for service_keys."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.service_key.AnsibleServiceKey"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.service_keys.AnsibleServiceKeys"
diff --git a/plugins/action/service_node.py b/plugins/action/service_nodes.py
similarity index 79%
rename from plugins/action/service_node.py
rename to plugins/action/service_nodes.py
index ec0db897..8229e267 100644
--- a/plugins/action/service_node.py
+++ b/plugins/action/service_nodes.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.service_node resource module.
+Action plugin for ansible.platform.service_nodes resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for service_node."""
+    """Resource module action plugin for service_nodes."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.service_node.AnsibleServiceNode"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.service_nodes.AnsibleServiceNodes"
diff --git a/plugins/action/service_type.py b/plugins/action/service_types.py
similarity index 79%
rename from plugins/action/service_type.py
rename to plugins/action/service_types.py
index 7331044e..56175a99 100644
--- a/plugins/action/service_type.py
+++ b/plugins/action/service_types.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.service_type resource module.
+Action plugin for ansible.platform.service_types resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for service_type."""
+    """Resource module action plugin for service_types."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.service_type.AnsibleServiceType"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.service_types.AnsibleServiceTypes"
diff --git a/plugins/action/service.py b/plugins/action/services.py
similarity index 72%
rename from plugins/action/service.py
rename to plugins/action/services.py
index 78fa7482..34047305 100644
--- a/plugins/action/service.py
+++ b/plugins/action/services.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.service resource module.
+Action plugin for ansible.platform.services resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for service."""
+    """Resource module action plugin for services."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.service.AnsibleService"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.services.AnsibleServices"
diff --git a/plugins/action/settings.py b/plugins/action/settings.py
index f12dbcbe..8b4a12d0 100644
--- a/plugins/action/settings.py
+++ b/plugins/action/settings.py
@@ -20,4 +20,4 @@
 class ActionModule(BaseResourceActionPlugin):
     """Resource module action plugin for setting."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.settings.AnsibleSetting"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.settings.AnsibleSettings"
diff --git a/plugins/action/team.py b/plugins/action/teams.py
similarity index 74%
rename from plugins/action/team.py
rename to plugins/action/teams.py
index cc3b7221..a85f951f 100644
--- a/plugins/action/team.py
+++ b/plugins/action/teams.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.team resource module.
+Action plugin for ansible.platform.teams resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for team."""
+    """Resource module action plugin for teams."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.team.AnsibleTeam"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.teams.AnsibleTeams"
diff --git a/plugins/action/user.py b/plugins/action/tokens.py
similarity index 73%
rename from plugins/action/user.py
rename to plugins/action/tokens.py
index 10f70e41..680fc6ae 100644
--- a/plugins/action/user.py
+++ b/plugins/action/tokens.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.user resource module.
+Action plugin for ansible.platform.tokens resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for user."""
+    """Resource module action plugin for tokens."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.user.AnsibleUser"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.tokens.AnsibleTokens"
diff --git a/plugins/action/ui_plugin_route.py b/plugins/action/ui_plugin_routes.py
similarity index 78%
rename from plugins/action/ui_plugin_route.py
rename to plugins/action/ui_plugin_routes.py
index 23fe8a46..9623fe1a 100644
--- a/plugins/action/ui_plugin_route.py
+++ b/plugins/action/ui_plugin_routes.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.ui_plugin_route resource module.
+Action plugin for ansible.platform.ui_plugin_routes resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for ui_plugin_route."""
+    """Resource module action plugin for ui_plugin_routes."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.ui_plugin_route.AnsibleUiPluginRoute"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.ui_plugin_routes.AnsibleUiPluginRoutes"
diff --git a/plugins/action/token.py b/plugins/action/users.py
similarity index 74%
rename from plugins/action/token.py
rename to plugins/action/users.py
index e705605e..d92c4c0b 100644
--- a/plugins/action/token.py
+++ b/plugins/action/users.py
@@ -3,7 +3,7 @@
 # (c) 2025, Ansible Platform Collection Contributors
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 """
-Action plugin for ansible.platform.token resource module.
+Action plugin for ansible.platform.users resource module.
 
 Auto-generated by tools/generate_resource.py — review before committing.
 """
@@ -18,6 +18,6 @@
 
 
 class ActionModule(BaseResourceActionPlugin):
-    """Resource module action plugin for token."""
+    """Resource module action plugin for users."""
 
-    USER_MODEL = "plugins.plugin_utils.ansible_models.token.AnsibleToken"
+    USER_MODEL = "plugins.plugin_utils.ansible_models.users.AnsibleUsers"
diff --git a/plugins/modules/application.py b/plugins/modules/applications.py
similarity index 96%
rename from plugins/modules/application.py
rename to plugins/modules/applications.py
index f5d9cc2c..7e8f8773 100644
--- a/plugins/modules/application.py
+++ b/plugins/modules/applications.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: application
+module: applications
 short_description: Manage gateway application resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -83,24 +83,24 @@
 
 EXAMPLES = """
 - name: Create application resources (merged)
-  ansible.platform.application:
+  ansible.platform.applications:
     config:
       - name: "my-application"
     state: merged
 
 - name: Gather current application state
-  ansible.platform.application:
+  ansible.platform.applications:
     state: gathered
   register: result
 
 - name: Delete specific application resources
-  ansible.platform.application:
+  ansible.platform.applications:
     config:
       - name: "my-application"
     state: deleted
 
 - name: Override — ensure only these application resources exist
-  ansible.platform.application:
+  ansible.platform.applications:
     config:
       - name: "keep-this-application"
     state: overridden
diff --git a/plugins/modules/authenticator_map.py b/plugins/modules/authenticator_maps.py
similarity index 95%
rename from plugins/modules/authenticator_map.py
rename to plugins/modules/authenticator_maps.py
index b661ea3a..35dde17d 100644
--- a/plugins/modules/authenticator_map.py
+++ b/plugins/modules/authenticator_maps.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: authenticator_map
+module: authenticator_maps
 short_description: Manage gateway authenticator_map resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -78,24 +78,24 @@
 
 EXAMPLES = """
 - name: Create authenticator_map resources (merged)
-  ansible.platform.authenticator_map:
+  ansible.platform.authenticator_maps:
     config:
       - name: "my-authenticator_map"
     state: merged
 
 - name: Gather current authenticator_map state
-  ansible.platform.authenticator_map:
+  ansible.platform.authenticator_maps:
     state: gathered
   register: result
 
 - name: Delete specific authenticator_map resources
-  ansible.platform.authenticator_map:
+  ansible.platform.authenticator_maps:
     config:
       - name: "my-authenticator_map"
     state: deleted
 
 - name: Override — ensure only these authenticator_map resources exist
-  ansible.platform.authenticator_map:
+  ansible.platform.authenticator_maps:
     config:
       - name: "keep-this-authenticator_map"
     state: overridden
diff --git a/plugins/modules/authenticator_user.py b/plugins/modules/authenticator_users.py
similarity index 92%
rename from plugins/modules/authenticator_user.py
rename to plugins/modules/authenticator_users.py
index 460239a6..604183e9 100644
--- a/plugins/modules/authenticator_user.py
+++ b/plugins/modules/authenticator_users.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: authenticator_user
+module: authenticator_users
 short_description: Manage gateway authenticator_user resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -37,24 +37,24 @@
 
 EXAMPLES = """
 - name: Create authenticator_user resources (merged)
-  ansible.platform.authenticator_user:
+  ansible.platform.authenticator_users:
     config:
       - name: "my-authenticator_user"
     state: merged
 
 - name: Gather current authenticator_user state
-  ansible.platform.authenticator_user:
+  ansible.platform.authenticator_users:
     state: gathered
   register: result
 
 - name: Delete specific authenticator_user resources
-  ansible.platform.authenticator_user:
+  ansible.platform.authenticator_users:
     config:
       - name: "my-authenticator_user"
     state: deleted
 
 - name: Override — ensure only these authenticator_user resources exist
-  ansible.platform.authenticator_user:
+  ansible.platform.authenticator_users:
     config:
       - name: "keep-this-authenticator_user"
     state: overridden
diff --git a/plugins/modules/authenticator.py b/plugins/modules/authenticators.py
similarity index 97%
rename from plugins/modules/authenticator.py
rename to plugins/modules/authenticators.py
index 5d377aaf..2efd1f9f 100644
--- a/plugins/modules/authenticator.py
+++ b/plugins/modules/authenticators.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: authenticator
+module: authenticators
 short_description: Manage gateway authenticator resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -92,24 +92,24 @@
 
 EXAMPLES = """
 - name: Create authenticator resources (merged)
-  ansible.platform.authenticator:
+  ansible.platform.authenticators:
     config:
       - name: "my-authenticator"
     state: merged
 
 - name: Gather current authenticator state
-  ansible.platform.authenticator:
+  ansible.platform.authenticators:
     state: gathered
   register: result
 
 - name: Delete specific authenticator resources
-  ansible.platform.authenticator:
+  ansible.platform.authenticators:
     config:
       - name: "my-authenticator"
     state: deleted
 
 - name: Override — ensure only these authenticator resources exist
-  ansible.platform.authenticator:
+  ansible.platform.authenticators:
     config:
       - name: "keep-this-authenticator"
     state: overridden
diff --git a/plugins/modules/ca_certificate.py b/plugins/modules/ca_certificates.py
similarity index 94%
rename from plugins/modules/ca_certificate.py
rename to plugins/modules/ca_certificates.py
index 521c4641..9378e242 100644
--- a/plugins/modules/ca_certificate.py
+++ b/plugins/modules/ca_certificates.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: ca_certificate
+module: ca_certificates
 short_description: Manage gateway ca_certificate resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -52,24 +52,24 @@
 
 EXAMPLES = """
 - name: Create ca_certificate resources (merged)
-  ansible.platform.ca_certificate:
+  ansible.platform.ca_certificates:
     config:
       - name: "my-ca_certificate"
     state: merged
 
 - name: Gather current ca_certificate state
-  ansible.platform.ca_certificate:
+  ansible.platform.ca_certificates:
     state: gathered
   register: result
 
 - name: Delete specific ca_certificate resources
-  ansible.platform.ca_certificate:
+  ansible.platform.ca_certificates:
     config:
       - name: "my-ca_certificate"
     state: deleted
 
 - name: Override — ensure only these ca_certificate resources exist
-  ansible.platform.ca_certificate:
+  ansible.platform.ca_certificates:
     config:
       - name: "keep-this-ca_certificate"
     state: overridden
diff --git a/plugins/modules/feature_flag.py b/plugins/modules/feature_flags.py
similarity index 93%
rename from plugins/modules/feature_flag.py
rename to plugins/modules/feature_flags.py
index 876005f3..5dbc0ee1 100644
--- a/plugins/modules/feature_flag.py
+++ b/plugins/modules/feature_flags.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: feature_flag
+module: feature_flags
 short_description: Manage gateway feature_flag resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -43,24 +43,24 @@
 
 EXAMPLES = """
 - name: Create feature_flag resources (merged)
-  ansible.platform.feature_flag:
+  ansible.platform.feature_flags:
     config:
       - name: "my-feature_flag"
     state: merged
 
 - name: Gather current feature_flag state
-  ansible.platform.feature_flag:
+  ansible.platform.feature_flags:
     state: gathered
   register: result
 
 - name: Delete specific feature_flag resources
-  ansible.platform.feature_flag:
+  ansible.platform.feature_flags:
     config:
       - name: "my-feature_flag"
     state: deleted
 
 - name: Override — ensure only these feature_flag resources exist
-  ansible.platform.feature_flag:
+  ansible.platform.feature_flags:
     config:
       - name: "keep-this-feature_flag"
     state: overridden
diff --git a/plugins/modules/http_port.py b/plugins/modules/http_ports.py
similarity index 94%
rename from plugins/modules/http_port.py
rename to plugins/modules/http_ports.py
index 0a23e597..5e94f785 100644
--- a/plugins/modules/http_port.py
+++ b/plugins/modules/http_ports.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: http_port
+module: http_ports
 short_description: Manage gateway http_port resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -51,24 +51,24 @@
 
 EXAMPLES = """
 - name: Create http_port resources (merged)
-  ansible.platform.http_port:
+  ansible.platform.http_ports:
     config:
       - name: "my-http_port"
     state: merged
 
 - name: Gather current http_port state
-  ansible.platform.http_port:
+  ansible.platform.http_ports:
     state: gathered
   register: result
 
 - name: Delete specific http_port resources
-  ansible.platform.http_port:
+  ansible.platform.http_ports:
     config:
       - name: "my-http_port"
     state: deleted
 
 - name: Override — ensure only these http_port resources exist
-  ansible.platform.http_port:
+  ansible.platform.http_ports:
     config:
       - name: "keep-this-http_port"
     state: overridden
diff --git a/plugins/modules/organization.py b/plugins/modules/organizations.py
similarity index 93%
rename from plugins/modules/organization.py
rename to plugins/modules/organizations.py
index 6b25fa18..291ee4f6 100644
--- a/plugins/modules/organization.py
+++ b/plugins/modules/organizations.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: organization
+module: organizations
 short_description: Manage gateway organization resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -44,24 +44,24 @@
 
 EXAMPLES = """
 - name: Create organization resources (merged)
-  ansible.platform.organization:
+  ansible.platform.organizations:
     config:
       - name: "my-organization"
     state: merged
 
 - name: Gather current organization state
-  ansible.platform.organization:
+  ansible.platform.organizations:
     state: gathered
   register: result
 
 - name: Delete specific organization resources
-  ansible.platform.organization:
+  ansible.platform.organizations:
     config:
       - name: "my-organization"
     state: deleted
 
 - name: Override — ensure only these organization resources exist
-  ansible.platform.organization:
+  ansible.platform.organizations:
     config:
       - name: "keep-this-organization"
     state: overridden
diff --git a/plugins/modules/role_definition.py b/plugins/modules/role_definitions.py
similarity index 93%
rename from plugins/modules/role_definition.py
rename to plugins/modules/role_definitions.py
index 444b7141..9a718d9c 100644
--- a/plugins/modules/role_definition.py
+++ b/plugins/modules/role_definitions.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: role_definition
+module: role_definitions
 short_description: Manage gateway role_definition resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -51,24 +51,24 @@
 
 EXAMPLES = """
 - name: Create role_definition resources (merged)
-  ansible.platform.role_definition:
+  ansible.platform.role_definitions:
     config:
       - name: "my-role_definition"
     state: merged
 
 - name: Gather current role_definition state
-  ansible.platform.role_definition:
+  ansible.platform.role_definitions:
     state: gathered
   register: result
 
 - name: Delete specific role_definition resources
-  ansible.platform.role_definition:
+  ansible.platform.role_definitions:
     config:
       - name: "my-role_definition"
     state: deleted
 
 - name: Override — ensure only these role_definition resources exist
-  ansible.platform.role_definition:
+  ansible.platform.role_definitions:
     config:
       - name: "keep-this-role_definition"
     state: overridden
diff --git a/plugins/modules/role_team_assignment.py b/plugins/modules/role_team_assignments.py
similarity index 93%
rename from plugins/modules/role_team_assignment.py
rename to plugins/modules/role_team_assignments.py
index 3f6fd556..d25be7c0 100644
--- a/plugins/modules/role_team_assignment.py
+++ b/plugins/modules/role_team_assignments.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: role_team_assignment
+module: role_team_assignments
 short_description: Manage gateway role_team_assignment resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -53,24 +53,24 @@
 
 EXAMPLES = """
 - name: Create role_team_assignment resources (merged)
-  ansible.platform.role_team_assignment:
+  ansible.platform.role_team_assignments:
     config:
       - name: "my-role_team_assignment"
     state: merged
 
 - name: Gather current role_team_assignment state
-  ansible.platform.role_team_assignment:
+  ansible.platform.role_team_assignments:
     state: gathered
   register: result
 
 - name: Delete specific role_team_assignment resources
-  ansible.platform.role_team_assignment:
+  ansible.platform.role_team_assignments:
     config:
       - name: "my-role_team_assignment"
     state: deleted
 
 - name: Override — ensure only these role_team_assignment resources exist
-  ansible.platform.role_team_assignment:
+  ansible.platform.role_team_assignments:
     config:
       - name: "keep-this-role_team_assignment"
     state: overridden
diff --git a/plugins/modules/role_user_assignment.py b/plugins/modules/role_user_assignments.py
similarity index 93%
rename from plugins/modules/role_user_assignment.py
rename to plugins/modules/role_user_assignments.py
index de266771..6683bc89 100644
--- a/plugins/modules/role_user_assignment.py
+++ b/plugins/modules/role_user_assignments.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: role_user_assignment
+module: role_user_assignments
 short_description: Manage gateway role_user_assignment resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -53,24 +53,24 @@
 
 EXAMPLES = """
 - name: Create role_user_assignment resources (merged)
-  ansible.platform.role_user_assignment:
+  ansible.platform.role_user_assignments:
     config:
       - name: "my-role_user_assignment"
     state: merged
 
 - name: Gather current role_user_assignment state
-  ansible.platform.role_user_assignment:
+  ansible.platform.role_user_assignments:
     state: gathered
   register: result
 
 - name: Delete specific role_user_assignment resources
-  ansible.platform.role_user_assignment:
+  ansible.platform.role_user_assignments:
     config:
       - name: "my-role_user_assignment"
     state: deleted
 
 - name: Override — ensure only these role_user_assignment resources exist
-  ansible.platform.role_user_assignment:
+  ansible.platform.role_user_assignments:
     config:
       - name: "keep-this-role_user_assignment"
     state: overridden
diff --git a/plugins/modules/route.py b/plugins/modules/routes.py
similarity index 96%
rename from plugins/modules/route.py
rename to plugins/modules/routes.py
index 41079f0f..1fa4a747 100644
--- a/plugins/modules/route.py
+++ b/plugins/modules/routes.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: route
+module: routes
 short_description: Manage gateway route resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -80,24 +80,24 @@
 
 EXAMPLES = """
 - name: Create route resources (merged)
-  ansible.platform.route:
+  ansible.platform.routes:
     config:
       - name: "my-route"
     state: merged
 
 - name: Gather current route state
-  ansible.platform.route:
+  ansible.platform.routes:
     state: gathered
   register: result
 
 - name: Delete specific route resources
-  ansible.platform.route:
+  ansible.platform.routes:
     config:
       - name: "my-route"
     state: deleted
 
 - name: Override — ensure only these route resources exist
-  ansible.platform.route:
+  ansible.platform.routes:
     config:
       - name: "keep-this-route"
     state: overridden
diff --git a/plugins/modules/service_cluster.py b/plugins/modules/service_clusters.py
similarity index 96%
rename from plugins/modules/service_cluster.py
rename to plugins/modules/service_clusters.py
index 523065e8..281fea29 100644
--- a/plugins/modules/service_cluster.py
+++ b/plugins/modules/service_clusters.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: service_cluster
+module: service_clusters
 short_description: Manage gateway service_cluster resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -106,24 +106,24 @@
 
 EXAMPLES = """
 - name: Create service_cluster resources (merged)
-  ansible.platform.service_cluster:
+  ansible.platform.service_clusters:
     config:
       - name: "my-service_cluster"
     state: merged
 
 - name: Gather current service_cluster state
-  ansible.platform.service_cluster:
+  ansible.platform.service_clusters:
     state: gathered
   register: result
 
 - name: Delete specific service_cluster resources
-  ansible.platform.service_cluster:
+  ansible.platform.service_clusters:
     config:
       - name: "my-service_cluster"
     state: deleted
 
 - name: Override — ensure only these service_cluster resources exist
-  ansible.platform.service_cluster:
+  ansible.platform.service_clusters:
     config:
       - name: "keep-this-service_cluster"
     state: overridden
diff --git a/plugins/modules/service_key.py b/plugins/modules/service_keys.py
similarity index 94%
rename from plugins/modules/service_key.py
rename to plugins/modules/service_keys.py
index 3a3a39c7..d41f947c 100644
--- a/plugins/modules/service_key.py
+++ b/plugins/modules/service_keys.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: service_key
+module: service_keys
 short_description: Manage gateway service_key resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -60,24 +60,24 @@
 
 EXAMPLES = """
 - name: Create service_key resources (merged)
-  ansible.platform.service_key:
+  ansible.platform.service_keys:
     config:
       - name: "my-service_key"
     state: merged
 
 - name: Gather current service_key state
-  ansible.platform.service_key:
+  ansible.platform.service_keys:
     state: gathered
   register: result
 
 - name: Delete specific service_key resources
-  ansible.platform.service_key:
+  ansible.platform.service_keys:
     config:
       - name: "my-service_key"
     state: deleted
 
 - name: Override — ensure only these service_key resources exist
-  ansible.platform.service_key:
+  ansible.platform.service_keys:
     config:
       - name: "keep-this-service_key"
     state: overridden
diff --git a/plugins/modules/service_node.py b/plugins/modules/service_nodes.py
similarity index 94%
rename from plugins/modules/service_node.py
rename to plugins/modules/service_nodes.py
index a0197c51..c454a5ef 100644
--- a/plugins/modules/service_node.py
+++ b/plugins/modules/service_nodes.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: service_node
+module: service_nodes
 short_description: Manage gateway service_node resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -52,24 +52,24 @@
 
 EXAMPLES = """
 - name: Create service_node resources (merged)
-  ansible.platform.service_node:
+  ansible.platform.service_nodes:
     config:
       - name: "my-service_node"
     state: merged
 
 - name: Gather current service_node state
-  ansible.platform.service_node:
+  ansible.platform.service_nodes:
     state: gathered
   register: result
 
 - name: Delete specific service_node resources
-  ansible.platform.service_node:
+  ansible.platform.service_nodes:
     config:
       - name: "my-service_node"
     state: deleted
 
 - name: Override — ensure only these service_node resources exist
-  ansible.platform.service_node:
+  ansible.platform.service_nodes:
     config:
       - name: "keep-this-service_node"
     state: overridden
diff --git a/plugins/modules/service_type.py b/plugins/modules/service_types.py
similarity index 94%
rename from plugins/modules/service_type.py
rename to plugins/modules/service_types.py
index 9285fed4..4572f427 100644
--- a/plugins/modules/service_type.py
+++ b/plugins/modules/service_types.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: service_type
+module: service_types
 short_description: Manage gateway service_type resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -53,24 +53,24 @@
 
 EXAMPLES = """
 - name: Create service_type resources (merged)
-  ansible.platform.service_type:
+  ansible.platform.service_types:
     config:
       - name: "my-service_type"
     state: merged
 
 - name: Gather current service_type state
-  ansible.platform.service_type:
+  ansible.platform.service_types:
     state: gathered
   register: result
 
 - name: Delete specific service_type resources
-  ansible.platform.service_type:
+  ansible.platform.service_types:
     config:
       - name: "my-service_type"
     state: deleted
 
 - name: Override — ensure only these service_type resources exist
-  ansible.platform.service_type:
+  ansible.platform.service_types:
     config:
       - name: "keep-this-service_type"
     state: overridden
diff --git a/plugins/modules/service.py b/plugins/modules/services.py
similarity index 96%
rename from plugins/modules/service.py
rename to plugins/modules/services.py
index 3f4ccb69..e8827de8 100644
--- a/plugins/modules/service.py
+++ b/plugins/modules/services.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: service
+module: services
 short_description: Manage gateway service resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -83,24 +83,24 @@
 
 EXAMPLES = """
 - name: Create service resources (merged)
-  ansible.platform.service:
+  ansible.platform.services:
     config:
       - name: "my-service"
     state: merged
 
 - name: Gather current service state
-  ansible.platform.service:
+  ansible.platform.services:
     state: gathered
   register: result
 
 - name: Delete specific service resources
-  ansible.platform.service:
+  ansible.platform.services:
     config:
       - name: "my-service"
     state: deleted
 
 - name: Override — ensure only these service resources exist
-  ansible.platform.service:
+  ansible.platform.services:
     config:
       - name: "keep-this-service"
     state: overridden
diff --git a/plugins/modules/team.py b/plugins/modules/teams.py
similarity index 95%
rename from plugins/modules/team.py
rename to plugins/modules/teams.py
index aa65d8c5..2a77bfad 100644
--- a/plugins/modules/team.py
+++ b/plugins/modules/teams.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: team
+module: teams
 short_description: Manage gateway team resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -48,24 +48,24 @@
 
 EXAMPLES = """
 - name: Create team resources (merged)
-  ansible.platform.team:
+  ansible.platform.teams:
     config:
       - name: "my-team"
     state: merged
 
 - name: Gather current team state
-  ansible.platform.team:
+  ansible.platform.teams:
     state: gathered
   register: result
 
 - name: Delete specific team resources
-  ansible.platform.team:
+  ansible.platform.teams:
     config:
       - name: "my-team"
     state: deleted
 
 - name: Override — ensure only these team resources exist
-  ansible.platform.team:
+  ansible.platform.teams:
     config:
       - name: "keep-this-team"
     state: overridden
diff --git a/plugins/modules/token.py b/plugins/modules/tokens.py
similarity index 95%
rename from plugins/modules/token.py
rename to plugins/modules/tokens.py
index 6217b1f8..e4480433 100644
--- a/plugins/modules/token.py
+++ b/plugins/modules/tokens.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: token
+module: tokens
 short_description: Manage gateway token resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -46,24 +46,24 @@
 
 EXAMPLES = """
 - name: Create token resources (merged)
-  ansible.platform.token:
+  ansible.platform.tokens:
     config:
       - name: "my-token"
     state: merged
 
 - name: Gather current token state
-  ansible.platform.token:
+  ansible.platform.tokens:
     state: gathered
   register: result
 
 - name: Delete specific token resources
-  ansible.platform.token:
+  ansible.platform.tokens:
     config:
       - name: "my-token"
     state: deleted
 
 - name: Override — ensure only these token resources exist
-  ansible.platform.token:
+  ansible.platform.tokens:
     config:
       - name: "keep-this-token"
     state: overridden
diff --git a/plugins/modules/ui_plugin_route.py b/plugins/modules/ui_plugin_routes.py
similarity index 95%
rename from plugins/modules/ui_plugin_route.py
rename to plugins/modules/ui_plugin_routes.py
index a15e2102..3ed9e376 100644
--- a/plugins/modules/ui_plugin_route.py
+++ b/plugins/modules/ui_plugin_routes.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: ui_plugin_route
+module: ui_plugin_routes
 short_description: Manage gateway ui_plugin_route resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -70,24 +70,24 @@
 
 EXAMPLES = """
 - name: Create ui_plugin_route resources (merged)
-  ansible.platform.ui_plugin_route:
+  ansible.platform.ui_plugin_routes:
     config:
       - name: "my-ui_plugin_route"
     state: merged
 
 - name: Gather current ui_plugin_route state
-  ansible.platform.ui_plugin_route:
+  ansible.platform.ui_plugin_routes:
     state: gathered
   register: result
 
 - name: Delete specific ui_plugin_route resources
-  ansible.platform.ui_plugin_route:
+  ansible.platform.ui_plugin_routes:
     config:
       - name: "my-ui_plugin_route"
     state: deleted
 
 - name: Override — ensure only these ui_plugin_route resources exist
-  ansible.platform.ui_plugin_route:
+  ansible.platform.ui_plugin_routes:
     config:
       - name: "keep-this-ui_plugin_route"
     state: overridden
diff --git a/plugins/modules/user.py b/plugins/modules/users.py
similarity index 96%
rename from plugins/modules/user.py
rename to plugins/modules/users.py
index 2d701120..8631dc08 100644
--- a/plugins/modules/user.py
+++ b/plugins/modules/users.py
@@ -12,7 +12,7 @@
 
 DOCUMENTATION = """
 ---
-module: user
+module: users
 short_description: Manage gateway user resources.
 author: Red Hat (@RedHatOfficial)
 description:
@@ -65,24 +65,24 @@
 
 EXAMPLES = """
 - name: Create user resources (merged)
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "my-user"
     state: merged
 
 - name: Gather current user state
-  ansible.platform.user:
+  ansible.platform.users:
     state: gathered
   register: result
 
 - name: Delete specific user resources
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "my-user"
     state: deleted
 
 - name: Override — ensure only these user resources exist
-  ansible.platform.user:
+  ansible.platform.users:
     config:
       - username: "keep-this-user"
     state: overridden
diff --git a/plugins/plugin_utils/ansible_models/application.py b/plugins/plugin_utils/ansible_models/applications.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/application.py
rename to plugins/plugin_utils/ansible_models/applications.py
index 78751a90..1b1fc795 100644
--- a/plugins/plugin_utils/ansible_models/application.py
+++ b/plugins/plugin_utils/ansible_models/applications.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleApplication(BaseTransformMixin):
+class AnsibleApplications(BaseTransformMixin):
     """Ansible representation of a gateway application (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/authenticator_map.py b/plugins/plugin_utils/ansible_models/authenticator_maps.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/authenticator_map.py
rename to plugins/plugin_utils/ansible_models/authenticator_maps.py
index 29a7cf0a..3c4159b8 100644
--- a/plugins/plugin_utils/ansible_models/authenticator_map.py
+++ b/plugins/plugin_utils/ansible_models/authenticator_maps.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleAuthenticatorMap(BaseTransformMixin):
+class AnsibleAuthenticatorMaps(BaseTransformMixin):
     """Ansible representation of a gateway authenticator_map (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/authenticator_user.py b/plugins/plugin_utils/ansible_models/authenticator_users.py
similarity index 92%
rename from plugins/plugin_utils/ansible_models/authenticator_user.py
rename to plugins/plugin_utils/ansible_models/authenticator_users.py
index e592a5b7..e32f9a86 100644
--- a/plugins/plugin_utils/ansible_models/authenticator_user.py
+++ b/plugins/plugin_utils/ansible_models/authenticator_users.py
@@ -10,7 +10,7 @@
 
 
 @dataclass
-class AnsibleAuthenticatorUser(BaseTransformMixin):
+class AnsibleAuthenticatorUsers(BaseTransformMixin):
     """Ansible representation of a gateway authenticator_user (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/authenticator.py b/plugins/plugin_utils/ansible_models/authenticators.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/authenticator.py
rename to plugins/plugin_utils/ansible_models/authenticators.py
index 6f0d2eac..7c862cb1 100644
--- a/plugins/plugin_utils/ansible_models/authenticator.py
+++ b/plugins/plugin_utils/ansible_models/authenticators.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleAuthenticator(BaseTransformMixin):
+class AnsibleAuthenticators(BaseTransformMixin):
     """Ansible representation of a gateway authenticator (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/ca_certificate.py b/plugins/plugin_utils/ansible_models/ca_certificates.py
similarity index 95%
rename from plugins/plugin_utils/ansible_models/ca_certificate.py
rename to plugins/plugin_utils/ansible_models/ca_certificates.py
index 404bea83..e593d545 100644
--- a/plugins/plugin_utils/ansible_models/ca_certificate.py
+++ b/plugins/plugin_utils/ansible_models/ca_certificates.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleCaCertificate(BaseTransformMixin):
+class AnsibleCaCertificates(BaseTransformMixin):
     """Ansible representation of a gateway ca_certificate (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/feature_flag.py b/plugins/plugin_utils/ansible_models/feature_flags.py
similarity index 95%
rename from plugins/plugin_utils/ansible_models/feature_flag.py
rename to plugins/plugin_utils/ansible_models/feature_flags.py
index e2fb6738..b92c6ad1 100644
--- a/plugins/plugin_utils/ansible_models/feature_flag.py
+++ b/plugins/plugin_utils/ansible_models/feature_flags.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleFeatureFlag(BaseTransformMixin):
+class AnsibleFeatureFlags(BaseTransformMixin):
     """Ansible representation of a gateway feature_flag (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/http_port.py b/plugins/plugin_utils/ansible_models/http_ports.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/http_port.py
rename to plugins/plugin_utils/ansible_models/http_ports.py
index d6f6f596..a21775f0 100644
--- a/plugins/plugin_utils/ansible_models/http_port.py
+++ b/plugins/plugin_utils/ansible_models/http_ports.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleHttpPort(BaseTransformMixin):
+class AnsibleHttpPorts(BaseTransformMixin):
     """Ansible representation of a gateway http_port (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/organization.py b/plugins/plugin_utils/ansible_models/organizations.py
similarity index 95%
rename from plugins/plugin_utils/ansible_models/organization.py
rename to plugins/plugin_utils/ansible_models/organizations.py
index c9504915..f27509e6 100644
--- a/plugins/plugin_utils/ansible_models/organization.py
+++ b/plugins/plugin_utils/ansible_models/organizations.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleOrganization(BaseTransformMixin):
+class AnsibleOrganizations(BaseTransformMixin):
     """Ansible representation of a gateway organization (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/role_definition.py b/plugins/plugin_utils/ansible_models/role_definitions.py
similarity index 95%
rename from plugins/plugin_utils/ansible_models/role_definition.py
rename to plugins/plugin_utils/ansible_models/role_definitions.py
index 2b6d67d6..ae3da000 100644
--- a/plugins/plugin_utils/ansible_models/role_definition.py
+++ b/plugins/plugin_utils/ansible_models/role_definitions.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleRoleDefinition(BaseTransformMixin):
+class AnsibleRoleDefinitions(BaseTransformMixin):
     """Ansible representation of a gateway role_definition (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/role_team_assignment.py b/plugins/plugin_utils/ansible_models/role_team_assignments.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/role_team_assignment.py
rename to plugins/plugin_utils/ansible_models/role_team_assignments.py
index 02b13c4f..a91a4056 100644
--- a/plugins/plugin_utils/ansible_models/role_team_assignment.py
+++ b/plugins/plugin_utils/ansible_models/role_team_assignments.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleRoleTeamAssignment(BaseTransformMixin):
+class AnsibleRoleTeamAssignments(BaseTransformMixin):
     """Ansible representation of a gateway role_team_assignment (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/role_user_assignment.py b/plugins/plugin_utils/ansible_models/role_user_assignments.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/role_user_assignment.py
rename to plugins/plugin_utils/ansible_models/role_user_assignments.py
index 15457d3a..d56db232 100644
--- a/plugins/plugin_utils/ansible_models/role_user_assignment.py
+++ b/plugins/plugin_utils/ansible_models/role_user_assignments.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleRoleUserAssignment(BaseTransformMixin):
+class AnsibleRoleUserAssignments(BaseTransformMixin):
     """Ansible representation of a gateway role_user_assignment (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/route.py b/plugins/plugin_utils/ansible_models/routes.py
similarity index 97%
rename from plugins/plugin_utils/ansible_models/route.py
rename to plugins/plugin_utils/ansible_models/routes.py
index a950153d..ed95d939 100644
--- a/plugins/plugin_utils/ansible_models/route.py
+++ b/plugins/plugin_utils/ansible_models/routes.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleRoute(BaseTransformMixin):
+class AnsibleRoutes(BaseTransformMixin):
     """Ansible representation of a gateway route (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/service_cluster.py b/plugins/plugin_utils/ansible_models/service_clusters.py
similarity index 97%
rename from plugins/plugin_utils/ansible_models/service_cluster.py
rename to plugins/plugin_utils/ansible_models/service_clusters.py
index 9eb5be1c..62d05ca6 100644
--- a/plugins/plugin_utils/ansible_models/service_cluster.py
+++ b/plugins/plugin_utils/ansible_models/service_clusters.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleServiceCluster(BaseTransformMixin):
+class AnsibleServiceClusters(BaseTransformMixin):
     """Ansible representation of a gateway service_cluster (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/service_key.py b/plugins/plugin_utils/ansible_models/service_keys.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/service_key.py
rename to plugins/plugin_utils/ansible_models/service_keys.py
index ac7e1c48..b448ef8e 100644
--- a/plugins/plugin_utils/ansible_models/service_key.py
+++ b/plugins/plugin_utils/ansible_models/service_keys.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleServiceKey(BaseTransformMixin):
+class AnsibleServiceKeys(BaseTransformMixin):
     """Ansible representation of a gateway service_key (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/service_node.py b/plugins/plugin_utils/ansible_models/service_nodes.py
similarity index 95%
rename from plugins/plugin_utils/ansible_models/service_node.py
rename to plugins/plugin_utils/ansible_models/service_nodes.py
index fedd0afa..57a935c3 100644
--- a/plugins/plugin_utils/ansible_models/service_node.py
+++ b/plugins/plugin_utils/ansible_models/service_nodes.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleServiceNode(BaseTransformMixin):
+class AnsibleServiceNodes(BaseTransformMixin):
     """Ansible representation of a gateway service_node (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/service_type.py b/plugins/plugin_utils/ansible_models/service_types.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/service_type.py
rename to plugins/plugin_utils/ansible_models/service_types.py
index 4d44dd57..6d98caca 100644
--- a/plugins/plugin_utils/ansible_models/service_type.py
+++ b/plugins/plugin_utils/ansible_models/service_types.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleServiceType(BaseTransformMixin):
+class AnsibleServiceTypes(BaseTransformMixin):
     """Ansible representation of a gateway service_type (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/service.py b/plugins/plugin_utils/ansible_models/services.py
similarity index 97%
rename from plugins/plugin_utils/ansible_models/service.py
rename to plugins/plugin_utils/ansible_models/services.py
index 4a9dc1db..33b286a4 100644
--- a/plugins/plugin_utils/ansible_models/service.py
+++ b/plugins/plugin_utils/ansible_models/services.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleService(BaseTransformMixin):
+class AnsibleServices(BaseTransformMixin):
     """Ansible representation of a gateway service (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/settings.py b/plugins/plugin_utils/ansible_models/settings.py
index 78f14648..ecfe9fe7 100644
--- a/plugins/plugin_utils/ansible_models/settings.py
+++ b/plugins/plugin_utils/ansible_models/settings.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleSetting(BaseTransformMixin):
+class AnsibleSettings(BaseTransformMixin):
     """Ansible representation of a gateway setting (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/team.py b/plugins/plugin_utils/ansible_models/teams.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/team.py
rename to plugins/plugin_utils/ansible_models/teams.py
index 435ee3dc..008127c5 100644
--- a/plugins/plugin_utils/ansible_models/team.py
+++ b/plugins/plugin_utils/ansible_models/teams.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleTeam(BaseTransformMixin):
+class AnsibleTeams(BaseTransformMixin):
     """Ansible representation of a gateway team (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/token.py b/plugins/plugin_utils/ansible_models/tokens.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/token.py
rename to plugins/plugin_utils/ansible_models/tokens.py
index d379f85b..97ad9057 100644
--- a/plugins/plugin_utils/ansible_models/token.py
+++ b/plugins/plugin_utils/ansible_models/tokens.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleToken(BaseTransformMixin):
+class AnsibleTokens(BaseTransformMixin):
     """Ansible representation of a gateway token (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/ui_plugin_route.py b/plugins/plugin_utils/ansible_models/ui_plugin_routes.py
similarity index 96%
rename from plugins/plugin_utils/ansible_models/ui_plugin_route.py
rename to plugins/plugin_utils/ansible_models/ui_plugin_routes.py
index 397e32aa..0f43f3b7 100644
--- a/plugins/plugin_utils/ansible_models/ui_plugin_route.py
+++ b/plugins/plugin_utils/ansible_models/ui_plugin_routes.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleUiPluginRoute(BaseTransformMixin):
+class AnsibleUiPluginRoutes(BaseTransformMixin):
     """Ansible representation of a gateway ui_plugin_route (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/ansible_models/user.py b/plugins/plugin_utils/ansible_models/users.py
similarity index 97%
rename from plugins/plugin_utils/ansible_models/user.py
rename to plugins/plugin_utils/ansible_models/users.py
index 36f2e70c..510e09a6 100644
--- a/plugins/plugin_utils/ansible_models/user.py
+++ b/plugins/plugin_utils/ansible_models/users.py
@@ -11,7 +11,7 @@
 
 
 @dataclass
-class AnsibleUser(BaseTransformMixin):
+class AnsibleUsers(BaseTransformMixin):
     """Ansible representation of a gateway user (resource module pattern)."""
 
     # Resource metadata for the base action plugin
diff --git a/plugins/plugin_utils/api/v1/application.py b/plugins/plugin_utils/api/v1/application.py
index 675e9e2f..a2b030fe 100644
--- a/plugins/plugin_utils/api/v1/application.py
+++ b/plugins/plugin_utils/api/v1/application.py
@@ -153,9 +153,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.application import AnsibleApplication
+        from ...ansible_models.applications import AnsibleApplications
 
-        return AnsibleApplication(
+        return AnsibleApplications(
             name=api_data.get("name"),
             redirect_uris=api_data.get("redirect_uris"),
             post_logout_redirect_uris=api_data.get("post_logout_redirect_uris"),
diff --git a/plugins/plugin_utils/api/v1/authenticator.py b/plugins/plugin_utils/api/v1/authenticator.py
index 635d7512..fd99f53d 100644
--- a/plugins/plugin_utils/api/v1/authenticator.py
+++ b/plugins/plugin_utils/api/v1/authenticator.py
@@ -123,9 +123,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.authenticator import AnsibleAuthenticator
+        from ...ansible_models.authenticators import AnsibleAuthenticators
 
-        return AnsibleAuthenticator(
+        return AnsibleAuthenticators(
             name=api_data.get("name"),
             enabled=api_data.get("enabled"),
             create_objects=api_data.get("create_objects"),
diff --git a/plugins/plugin_utils/api/v1/authenticator_map.py b/plugins/plugin_utils/api/v1/authenticator_map.py
index 6a957646..dfbba7d5 100644
--- a/plugins/plugin_utils/api/v1/authenticator_map.py
+++ b/plugins/plugin_utils/api/v1/authenticator_map.py
@@ -123,9 +123,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.authenticator_map import AnsibleAuthenticatorMap
+        from ...ansible_models.authenticator_maps import AnsibleAuthenticatorMaps
 
-        return AnsibleAuthenticatorMap(
+        return AnsibleAuthenticatorMaps(
             name=api_data.get("name"),
             authenticator=api_data.get("authenticator"),
             map_type=api_data.get("map_type"),
diff --git a/plugins/plugin_utils/api/v1/authenticator_user.py b/plugins/plugin_utils/api/v1/authenticator_user.py
index 630cf47d..a7a186f6 100644
--- a/plugins/plugin_utils/api/v1/authenticator_user.py
+++ b/plugins/plugin_utils/api/v1/authenticator_user.py
@@ -74,6 +74,6 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.authenticator_user import AnsibleAuthenticatorUser
+        from ...ansible_models.authenticator_users import AnsibleAuthenticatorUsers
 
-        return AnsibleAuthenticatorUser()
+        return AnsibleAuthenticatorUsers()
diff --git a/plugins/plugin_utils/api/v1/ca_certificate.py b/plugins/plugin_utils/api/v1/ca_certificate.py
index 00a15fb0..b8ed03ae 100644
--- a/plugins/plugin_utils/api/v1/ca_certificate.py
+++ b/plugins/plugin_utils/api/v1/ca_certificate.py
@@ -113,9 +113,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.ca_certificate import AnsibleCaCertificate
+        from ...ansible_models.ca_certificates import AnsibleCaCertificates
 
-        return AnsibleCaCertificate(
+        return AnsibleCaCertificates(
             name=api_data.get("name"),
             pem_data=api_data.get("pem_data"),
             sha256=api_data.get("sha256"),
diff --git a/plugins/plugin_utils/api/v1/feature_flag.py b/plugins/plugin_utils/api/v1/feature_flag.py
index a40e0750..c6bf7de5 100644
--- a/plugins/plugin_utils/api/v1/feature_flag.py
+++ b/plugins/plugin_utils/api/v1/feature_flag.py
@@ -91,9 +91,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.feature_flag import AnsibleFeatureFlag
+        from ...ansible_models.feature_flags import AnsibleFeatureFlags
 
-        return AnsibleFeatureFlag(
+        return AnsibleFeatureFlags(
             name=api_data.get("name"),
             value=api_data.get("value"),
             id=api_data.get("id"),
diff --git a/plugins/plugin_utils/api/v1/http_port.py b/plugins/plugin_utils/api/v1/http_port.py
index 9f1b6e2d..fbc5c799 100644
--- a/plugins/plugin_utils/api/v1/http_port.py
+++ b/plugins/plugin_utils/api/v1/http_port.py
@@ -113,9 +113,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.http_port import AnsibleHttpPort
+        from ...ansible_models.http_ports import AnsibleHttpPorts
 
-        return AnsibleHttpPort(
+        return AnsibleHttpPorts(
             name=api_data.get("name"),
             number=api_data.get("number"),
             use_https=api_data.get("use_https"),
diff --git a/plugins/plugin_utils/api/v1/organization.py b/plugins/plugin_utils/api/v1/organization.py
index 0cb989ba..76885e67 100644
--- a/plugins/plugin_utils/api/v1/organization.py
+++ b/plugins/plugin_utils/api/v1/organization.py
@@ -110,9 +110,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.organization import AnsibleOrganization
+        from ...ansible_models.organizations import AnsibleOrganizations
 
-        return AnsibleOrganization(
+        return AnsibleOrganizations(
             name=api_data.get("name"),
             description=api_data.get("description"),
             id=api_data.get("id"),
diff --git a/plugins/plugin_utils/api/v1/role_definition.py b/plugins/plugin_utils/api/v1/role_definition.py
index a24c2811..0152086c 100644
--- a/plugins/plugin_utils/api/v1/role_definition.py
+++ b/plugins/plugin_utils/api/v1/role_definition.py
@@ -114,9 +114,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.role_definition import AnsibleRoleDefinition
+        from ...ansible_models.role_definitions import AnsibleRoleDefinitions
 
-        return AnsibleRoleDefinition(
+        return AnsibleRoleDefinitions(
             permissions=api_data.get("permissions"),
             content_type=api_data.get("content_type"),
             name=api_data.get("name"),
diff --git a/plugins/plugin_utils/api/v1/role_team_assignment.py b/plugins/plugin_utils/api/v1/role_team_assignment.py
index 9206a728..89cc2ccf 100644
--- a/plugins/plugin_utils/api/v1/role_team_assignment.py
+++ b/plugins/plugin_utils/api/v1/role_team_assignment.py
@@ -118,9 +118,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.role_team_assignment import AnsibleRoleTeamAssignment
+        from ...ansible_models.role_team_assignments import AnsibleRoleTeamAssignments
 
-        return AnsibleRoleTeamAssignment(
+        return AnsibleRoleTeamAssignments(
             object_id=api_data.get("object_id"),
             object_ansible_id=api_data.get("object_ansible_id"),
             role_definition=api_data.get("role_definition"),
diff --git a/plugins/plugin_utils/api/v1/role_user_assignment.py b/plugins/plugin_utils/api/v1/role_user_assignment.py
index 049b8294..8e5963d3 100644
--- a/plugins/plugin_utils/api/v1/role_user_assignment.py
+++ b/plugins/plugin_utils/api/v1/role_user_assignment.py
@@ -114,9 +114,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.role_user_assignment import AnsibleRoleUserAssignment
+        from ...ansible_models.role_user_assignments import AnsibleRoleUserAssignments
 
-        return AnsibleRoleUserAssignment(
+        return AnsibleRoleUserAssignments(
             object_id=api_data.get("object_id"),
             object_ansible_id=api_data.get("object_ansible_id"),
             role_definition=api_data.get("role_definition"),
diff --git a/plugins/plugin_utils/api/v1/route.py b/plugins/plugin_utils/api/v1/route.py
index d60c2d2b..88e05e45 100644
--- a/plugins/plugin_utils/api/v1/route.py
+++ b/plugins/plugin_utils/api/v1/route.py
@@ -155,9 +155,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.route import AnsibleRoute
+        from ...ansible_models.routes import AnsibleRoutes
 
-        return AnsibleRoute(
+        return AnsibleRoutes(
             name=api_data.get("name"),
             http_port=api_data.get("http_port"),
             service_cluster=api_data.get("service_cluster"),
diff --git a/plugins/plugin_utils/api/v1/service.py b/plugins/plugin_utils/api/v1/service.py
index 073844d9..48d4aa33 100644
--- a/plugins/plugin_utils/api/v1/service.py
+++ b/plugins/plugin_utils/api/v1/service.py
@@ -160,9 +160,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.service import AnsibleService
+        from ...ansible_models.services import AnsibleServices
 
-        return AnsibleService(
+        return AnsibleServices(
             name=api_data.get("name"),
             http_port=api_data.get("http_port"),
             service_cluster=api_data.get("service_cluster"),
diff --git a/plugins/plugin_utils/api/v1/service_cluster.py b/plugins/plugin_utils/api/v1/service_cluster.py
index 88174918..f1ce0db0 100644
--- a/plugins/plugin_utils/api/v1/service_cluster.py
+++ b/plugins/plugin_utils/api/v1/service_cluster.py
@@ -176,9 +176,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.service_cluster import AnsibleServiceCluster
+        from ...ansible_models.service_clusters import AnsibleServiceClusters
 
-        return AnsibleServiceCluster(
+        return AnsibleServiceClusters(
             name=api_data.get("name"),
             service_type=api_data.get("service_type"),
             auth_type=api_data.get("auth_type"),
diff --git a/plugins/plugin_utils/api/v1/service_key.py b/plugins/plugin_utils/api/v1/service_key.py
index 98952ede..ee8b1664 100644
--- a/plugins/plugin_utils/api/v1/service_key.py
+++ b/plugins/plugin_utils/api/v1/service_key.py
@@ -118,9 +118,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.service_key import AnsibleServiceKey
+        from ...ansible_models.service_keys import AnsibleServiceKeys
 
-        return AnsibleServiceKey(
+        return AnsibleServiceKeys(
             name=api_data.get("name"),
             service_cluster=api_data.get("service_cluster"),
             is_active=api_data.get("is_active"),
diff --git a/plugins/plugin_utils/api/v1/service_node.py b/plugins/plugin_utils/api/v1/service_node.py
index 50eb9cf5..2cebfa8f 100644
--- a/plugins/plugin_utils/api/v1/service_node.py
+++ b/plugins/plugin_utils/api/v1/service_node.py
@@ -113,9 +113,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.service_node import AnsibleServiceNode
+        from ...ansible_models.service_nodes import AnsibleServiceNodes
 
-        return AnsibleServiceNode(
+        return AnsibleServiceNodes(
             name=api_data.get("name"),
             address=api_data.get("address"),
             service_cluster=api_data.get("service_cluster"),
diff --git a/plugins/plugin_utils/api/v1/service_type.py b/plugins/plugin_utils/api/v1/service_type.py
index 0adcc9c8..61e0735d 100644
--- a/plugins/plugin_utils/api/v1/service_type.py
+++ b/plugins/plugin_utils/api/v1/service_type.py
@@ -115,9 +115,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.service_type import AnsibleServiceType
+        from ...ansible_models.service_types import AnsibleServiceTypes
 
-        return AnsibleServiceType(
+        return AnsibleServiceTypes(
             name=api_data.get("name"),
             login_path=api_data.get("login_path"),
             logout_path=api_data.get("logout_path"),
diff --git a/plugins/plugin_utils/api/v1/settings.py b/plugins/plugin_utils/api/v1/settings.py
index 174739c6..11453590 100644
--- a/plugins/plugin_utils/api/v1/settings.py
+++ b/plugins/plugin_utils/api/v1/settings.py
@@ -78,16 +78,16 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.settings import AnsibleSetting
+        from ...ansible_models.settings import AnsibleSettings
 
         # api_data may be a flat settings dict {KEY: value, ...}
         # or a list item {key: KEY, value: val} — handle both
         if isinstance(api_data, dict) and not any(k in api_data for k in ("key", "value", "id", "url")):
             # Flat dict from /settings/all/ endpoint
-            return AnsibleSetting(settings=dict(api_data))
+            return AnsibleSettings(settings=dict(api_data))
 
         # Fall back: return empty
-        return AnsibleSetting()
+        return AnsibleSettings()
 
 
 # Alias: the loader looks for SettingsTransformMixin_v1 (plural)
diff --git a/plugins/plugin_utils/api/v1/team.py b/plugins/plugin_utils/api/v1/team.py
index 4f59cadd..7403a3ee 100644
--- a/plugins/plugin_utils/api/v1/team.py
+++ b/plugins/plugin_utils/api/v1/team.py
@@ -127,9 +127,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.team import AnsibleTeam
+        from ...ansible_models.teams import AnsibleTeams
 
-        return AnsibleTeam(
+        return AnsibleTeams(
             name=api_data.get("name"),
             organization=api_data.get("organization"),
             description=api_data.get("description"),
diff --git a/plugins/plugin_utils/api/v1/token.py b/plugins/plugin_utils/api/v1/token.py
index e25371c8..a8baf249 100644
--- a/plugins/plugin_utils/api/v1/token.py
+++ b/plugins/plugin_utils/api/v1/token.py
@@ -130,9 +130,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.token import AnsibleToken
+        from ...ansible_models.tokens import AnsibleTokens
 
-        return AnsibleToken(
+        return AnsibleTokens(
             application=api_data.get("application"),
             description=api_data.get("description"),
             scope=api_data.get("scope"),
diff --git a/plugins/plugin_utils/api/v1/ui_plugin_route.py b/plugins/plugin_utils/api/v1/ui_plugin_route.py
index 5098dcd7..1ca49da0 100644
--- a/plugins/plugin_utils/api/v1/ui_plugin_route.py
+++ b/plugins/plugin_utils/api/v1/ui_plugin_route.py
@@ -124,9 +124,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.ui_plugin_route import AnsibleUiPluginRoute
+        from ...ansible_models.ui_plugin_routes import AnsibleUiPluginRoutes
 
-        return AnsibleUiPluginRoute(
+        return AnsibleUiPluginRoutes(
             name=api_data.get("name"),
             http_port=api_data.get("http_port"),
             service_cluster=api_data.get("service_cluster"),
diff --git a/plugins/plugin_utils/api/v1/user.py b/plugins/plugin_utils/api/v1/user.py
index 35de75a5..31f5f50b 100644
--- a/plugins/plugin_utils/api/v1/user.py
+++ b/plugins/plugin_utils/api/v1/user.py
@@ -160,9 +160,9 @@ def from_api(
         api_data: Dict[str, Any],
         context: Union[TransformContext, Dict[str, Any]],
     ):
-        from ...ansible_models.user import AnsibleUser
+        from ...ansible_models.users import AnsibleUsers
 
-        return AnsibleUser(
+        return AnsibleUsers(
             username=api_data.get("username"),
             email=api_data.get("email"),
             first_name=api_data.get("first_name"),
diff --git a/plugins/plugin_utils/platform/loader.py b/plugins/plugin_utils/platform/loader.py
index 9ebc01b7..449f4418 100644
--- a/plugins/plugin_utils/platform/loader.py
+++ b/plugins/plugin_utils/platform/loader.py
@@ -93,8 +93,11 @@ def _load_ansible_class(self, module_name: str) -> Type:
             ImportError: If module cannot be imported
             ValueError: If class cannot be found
         """
-        # Import from ansible_models/<module_name>.py
-        module_path = f"ansible_collections.ansible.platform.plugins.plugin_utils.ansible_models.{module_name}"
+        # Model files are plural (e.g., MODULE_NAME="application" -> "applications.py")
+        module_file_name = module_name if module_name.endswith("s") else module_name + "s"
+
+        # Import from ansible_models/<module_file_name>.py
+        module_path = f"ansible_collections.ansible.platform.plugins.plugin_utils.ansible_models.{module_file_name}"
 
         try:
             module = importlib.import_module(module_path)
@@ -102,8 +105,8 @@ def _load_ansible_class(self, module_name: str) -> Type:
             logger.error("Failed to import Ansible module %s: %s", module_path, e)
             raise ImportError(f"Failed to import Ansible module {module_path}: {e}") from e
 
-        # Find Ansible dataclass (e.g., AnsibleUser, AnsibleCACertificate)
-        class_name = f"Ansible{_to_pascal_case(module_name)}"
+        # Find Ansible dataclass (e.g., AnsibleUsers, AnsibleApplications)
+        class_name = f"Ansible{_to_pascal_case(module_file_name)}"
         target_lower = class_name.lower()
 
         if hasattr(module, class_name):
diff --git a/tools/generate_integration_tests.py b/tools/generate_integration_tests.py
index 052cbd25..003cdd94 100644
--- a/tools/generate_integration_tests.py
+++ b/tools/generate_integration_tests.py
@@ -87,7 +87,7 @@ class ModuleFixture:
 
 
 FIXTURES: Dict[str, ModuleFixture] = {
-    "organization": ModuleFixture(
+    "organizations": ModuleFixture(
         canonical_field="name",
         prefix="int-org-",
         resources=[
@@ -101,7 +101,7 @@ class ModuleFixture:
             {"name": "int-org-delta", "description": "Delta seed"},
         ],
     ),
-    "user": ModuleFixture(
+    "users": ModuleFixture(
         canonical_field="username",
         prefix="int-user-",
         resources=[
@@ -153,7 +153,7 @@ class ModuleFixture:
             },
         ],
     ),
-    "team": ModuleFixture(
+    "teams": ModuleFixture(
         canonical_field="name",
         prefix="int-team-",
         # organization: 1 = "Default" org, always seeded by mock_gateway_server.seed_defaults()
@@ -168,7 +168,7 @@ class ModuleFixture:
             {"name": "int-team-delta", "description": "Delta seed", "organization": 1},
         ],
     ),
-    "role_definition": ModuleFixture(
+    "role_definitions": ModuleFixture(
         canonical_field="name",
         prefix="int-roledef-",
         resources=[
@@ -201,7 +201,7 @@ class ModuleFixture:
             },
         ],
     ),
-    "token": ModuleFixture(
+    "tokens": ModuleFixture(
         canonical_field="description",
         prefix="int-token-",
         resources=[
@@ -214,7 +214,7 @@ class ModuleFixture:
             {"description": "Gamma seed", "scope": "read"},
         ],
     ),
-    "application": ModuleFixture(
+    "applications": ModuleFixture(
         canonical_field="name",
         prefix="int-app-",
         # organization: 1 = "Default" org, always seeded by mock_gateway_server.seed_defaults()
@@ -228,7 +228,7 @@ class ModuleFixture:
             {"name": "int-app-gamma", "description": "Gamma seed", "organization": 1},
         ],
     ),
-    "service_cluster": ModuleFixture(
+    "service_clusters": ModuleFixture(
         canonical_field="name",
         prefix="int-cluster-",
         resources=[
@@ -239,7 +239,7 @@ class ModuleFixture:
         replaced_config={"name": "int-cluster-alpha", "outlier_detection_enabled": False},
         extra_seeds=[{"name": "int-cluster-gamma", "outlier_detection_enabled": False}],
     ),
-    "service_type": ModuleFixture(
+    "service_types": ModuleFixture(
         canonical_field="name",
         prefix="int-stype-",
         resources=[
@@ -250,7 +250,7 @@ class ModuleFixture:
         replaced_config={"name": "int-stype-alpha", "login_path": "/login"},
         extra_seeds=[{"name": "int-stype-gamma", "login_path": "/login"}],
     ),
-    "http_port": ModuleFixture(
+    "http_ports": ModuleFixture(
         canonical_field="name",
         prefix="int-port-",
         resources=[
@@ -261,7 +261,7 @@ class ModuleFixture:
         replaced_config={"name": "int-port-alpha", "use_https": False},
         extra_seeds=[{"name": "int-port-gamma", "use_https": False}],
     ),
-    "route": ModuleFixture(
+    "routes": ModuleFixture(
         canonical_field="name",
         prefix="int-route-",
         resources=[
@@ -272,7 +272,7 @@ class ModuleFixture:
         replaced_config={"name": "int-route-alpha", "description": "Alpha route"},
         extra_seeds=[{"name": "int-route-gamma", "description": "Gamma seed"}],
     ),
-    "ui_plugin_route": ModuleFixture(
+    "ui_plugin_routes": ModuleFixture(
         canonical_field="name",
         prefix="int-uipr-",
         resources=[
@@ -283,7 +283,7 @@ class ModuleFixture:
         replaced_config={"name": "int-uipr-alpha", "description": "Alpha ui plugin route"},
         extra_seeds=[{"name": "int-uipr-gamma", "description": "Gamma seed"}],
     ),
-    "ca_certificate": ModuleFixture(
+    "ca_certificates": ModuleFixture(
         canonical_field="name",
         prefix="int-cert-",
         resources=[
@@ -294,7 +294,7 @@ class ModuleFixture:
         replaced_config={"name": "int-cert-alpha", "pem_data": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0t"},
         extra_seeds=[{"name": "int-cert-gamma", "pem_data": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0t"}],
     ),
-    "authenticator": ModuleFixture(
+    "authenticators": ModuleFixture(
         canonical_field="name",
         prefix="int-auth-",
         resources=[
@@ -308,7 +308,7 @@ class ModuleFixture:
             {"name": "int-auth-gamma", "type": "ansible_base.authentication.authenticator_plugins.local", "enabled": True},
         ],
     ),
-    "authenticator_map": ModuleFixture(
+    "authenticator_maps": ModuleFixture(
         canonical_field="name",
         prefix="int-authmap-",
         # authenticator: 3100 = first ID in mock server's authenticator range (start_id=3100).
@@ -324,7 +324,7 @@ class ModuleFixture:
         prepare_all_states=True,
         prereq_yaml="""\
     - name: Seed prerequisite authenticator (required by all authenticator_map tests)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
             type: "ansible_base.authentication.authenticator_plugins.local"
@@ -336,7 +336,7 @@ class ModuleFixture:
 """,
         cleanup_prereq_yaml="""\
     - name: Remove prerequisite authenticator (test teardown)
-      ansible.platform.authenticator:
+      ansible.platform.authenticators:
         config:
           - name: "int-prereq-authn"
         state: deleted
@@ -347,7 +347,7 @@ class ModuleFixture:
       failed_when: false
 """,
     ),
-    "service": ModuleFixture(
+    "services": ModuleFixture(
         canonical_field="name",
         prefix="int-svc-",
         resources=[
@@ -358,7 +358,7 @@ class ModuleFixture:
         replaced_config={"name": "int-svc-alpha", "description": "Alpha service"},
         extra_seeds=[{"name": "int-svc-gamma", "description": "Gamma seed"}],
     ),
-    "service_key": ModuleFixture(
+    "service_keys": ModuleFixture(
         canonical_field="name",
         prefix="int-skey-",
         resources=[
@@ -369,7 +369,7 @@ class ModuleFixture:
         replaced_config={"name": "int-skey-alpha", "is_active": True},
         extra_seeds=[{"name": "int-skey-gamma", "is_active": True}],
     ),
-    "service_node": ModuleFixture(
+    "service_nodes": ModuleFixture(
         canonical_field="name",
         prefix="int-snode-",
         resources=[
@@ -400,8 +400,8 @@ def load_model_class(module_name: str):
 
 
 def get_all_module_names() -> List[str]:
-    models_dir = COLLECTION_ROOT / "plugins" / "plugin_utils" / "ansible_models"
-    return sorted(p.stem for p in models_dir.glob("*.py") if not p.stem.startswith("_") and p.stem != "base_transform")
+    """Return module names from the FIXTURES registry (plural, public names)."""
+    return sorted(FIXTURES.keys())
 
 
 # ---------------------------------------------------------------------------