chore: rename oid4vci

Signed-off-by: Pat Losoponkul <pat.losoponkul@iohk.io>
hyperledger · May 8, 2024 · 359b0ad · 359b0ad
1 parent 68a15c6
commit 359b0ad
Show file tree

Hide file tree

Showing 31 changed files with 64 additions and 64 deletions.
diff --git a/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/CloudAgentApp.scala b/...nt/service/server/src/main/scala/org/hyperledger/identus/agent/server/CloudAgentApp.scala
@@ -19,7 +19,7 @@ import org.hyperledger.identus.iam.entity.http.EntityServerEndpoints
 import org.hyperledger.identus.iam.wallet.http.WalletManagementServerEndpoints
 import org.hyperledger.identus.issue.controller.IssueServerEndpoints
 import org.hyperledger.identus.mercury.{DidOps, HttpClient}
-import org.hyperledger.identus.oidc4vc.CredentialIssuerServerEndpoints
+import org.hyperledger.identus.oid4vci.CredentialIssuerServerEndpoints
 import org.hyperledger.identus.pollux.core.service.{CredentialService, PresentationService}
 import org.hyperledger.identus.pollux.credentialdefinition.CredentialDefinitionRegistryServerEndpoints
 import org.hyperledger.identus.pollux.credentialschema.{

diff --git a/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala b/cloud-agent/service/server/src/main/scala/org/hyperledger/identus/agent/server/MainApp.scala
@@ -34,9 +34,9 @@ import org.hyperledger.identus.iam.entity.http.controller.{EntityController, Ent
 import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementControllerImpl
 import org.hyperledger.identus.issue.controller.IssueControllerImpl
 import org.hyperledger.identus.mercury.*
-import org.hyperledger.identus.oidc4vc.controller.CredentialIssuerControllerImpl
-import org.hyperledger.identus.oidc4vc.service.OIDCCredentialIssuerServiceImpl
-import org.hyperledger.identus.oidc4vc.storage.InMemoryIssuanceSessionService
+import org.hyperledger.identus.oid4vci.controller.CredentialIssuerControllerImpl
+import org.hyperledger.identus.oid4vci.service.OIDCCredentialIssuerServiceImpl
+import org.hyperledger.identus.oid4vci.storage.InMemoryIssuanceSessionService
 import org.hyperledger.identus.pollux.core.service.*
 import org.hyperledger.identus.pollux.core.service.verification.VcVerificationServiceImpl
 import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionControllerImpl
@@ -205,7 +205,7 @@ object MainApp extends ZIOAppDefault {
           // oidc
           CredentialIssuerControllerImpl.layer,
           InMemoryIssuanceSessionService.layer,
-          OIDC4VCIssuerMetadataServiceImpl.layer,
+          OID4VCIIssuerMetadataServiceImpl.layer,
           OIDCCredentialIssuerServiceImpl.layer,
           // event notification service
           ZLayer.succeed(500) >>> EventNotificationServiceImpl.layer,

diff --git a/...s/oidc4vc/CredentialIssuerEndpoints.scala → ...s/oid4vci/CredentialIssuerEndpoints.scala b/...s/oidc4vc/CredentialIssuerEndpoints.scala → ...s/oid4vci/CredentialIssuerEndpoints.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc
+package org.hyperledger.identus.oid4vci
 
 import org.hyperledger.identus.api.http.{EndpointOutputs, ErrorResponse, RequestContext}
 import org.hyperledger.identus.castor.controller.http.DIDInput
@@ -7,7 +7,7 @@ import org.hyperledger.identus.iam.authentication.apikey.ApiKeyCredentials
 import org.hyperledger.identus.iam.authentication.apikey.ApiKeyEndpointSecurityLogic.apiKeyHeader
 import org.hyperledger.identus.iam.authentication.oidc.JwtCredentials
 import org.hyperledger.identus.iam.authentication.oidc.JwtSecurityLogic.jwtAuthHeader
-import org.hyperledger.identus.oidc4vc.http.*
+import org.hyperledger.identus.oid4vci.http.*
 import sttp.apispec.Tag
 import sttp.model.StatusCode
 import sttp.tapir.*
@@ -42,7 +42,7 @@ object CredentialIssuerEndpoints {
   private val baseEndpoint = endpoint
     .tag(tagName)
     .in(extractFromRequest[RequestContext](RequestContext.apply))
-    .in("oidc4vc" / "issuers")
+    .in("oid4vci" / "issuers")
 
   private val baseIssuerPrivateEndpoint = baseEndpoint
     .securityIn(apiKeyHeader)

diff --git a/...4vc/CredentialIssuerServerEndpoints.scala → ...vci/CredentialIssuerServerEndpoints.scala b/...4vc/CredentialIssuerServerEndpoints.scala → ...vci/CredentialIssuerServerEndpoints.scala
@@ -1,11 +1,11 @@
-package org.hyperledger.identus.oidc4vc
+package org.hyperledger.identus.oid4vci
 
 import org.hyperledger.identus.LogUtils.*
 import org.hyperledger.identus.agent.walletapi.model.BaseEntity
 import org.hyperledger.identus.api.http.{ErrorResponse, RequestContext}
 import org.hyperledger.identus.iam.authentication.{Authenticator, Authorizer, DefaultAuthenticator, SecurityLogic}
-import org.hyperledger.identus.oidc4vc.controller.CredentialIssuerController
-import org.hyperledger.identus.oidc4vc.http.{CredentialErrorResponse, CredentialRequest, NonceResponse}
+import org.hyperledger.identus.oid4vci.controller.CredentialIssuerController
+import org.hyperledger.identus.oid4vci.http.{CredentialErrorResponse, CredentialRequest, NonceResponse}
 import sttp.tapir.ztapir.*
 import zio.*
 

diff --git a/...ntroller/CredentialIssuerController.scala → ...ntroller/CredentialIssuerController.scala b/...ntroller/CredentialIssuerController.scala → ...ntroller/CredentialIssuerController.scala
@@ -1,16 +1,16 @@
-package org.hyperledger.identus.oidc4vc.controller
+package org.hyperledger.identus.oid4vci.controller
 
 import org.hyperledger.identus.agent.server.config.AppConfig
 import org.hyperledger.identus.api.http.ErrorResponse.badRequest
 import org.hyperledger.identus.api.http.ErrorResponse.internalServerError
 import org.hyperledger.identus.api.http.{ErrorResponse, RequestContext}
 import org.hyperledger.identus.api.util.PaginationUtils
 import org.hyperledger.identus.castor.core.model.did.{CanonicalPrismDID, PrismDID}
-import org.hyperledger.identus.oidc4vc.CredentialIssuerEndpoints.ExtendedErrorResponse
-import org.hyperledger.identus.oidc4vc.http.*
-import org.hyperledger.identus.oidc4vc.http.CredentialErrorCode.*
-import org.hyperledger.identus.oidc4vc.service.OIDCCredentialIssuerService
-import org.hyperledger.identus.pollux.core.service.OIDC4VCIssuerMetadataService
+import org.hyperledger.identus.oid4vci.CredentialIssuerEndpoints.ExtendedErrorResponse
+import org.hyperledger.identus.oid4vci.http.*
+import org.hyperledger.identus.oid4vci.http.CredentialErrorCode.*
+import org.hyperledger.identus.oid4vci.service.OIDCCredentialIssuerService
+import org.hyperledger.identus.pollux.core.service.OID4VCIIssuerMetadataService
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.{IO, URLayer, ZIO, ZLayer}
 
@@ -128,7 +128,7 @@ object CredentialIssuerController {
 
 case class CredentialIssuerControllerImpl(
     credentialIssuerService: OIDCCredentialIssuerService,
-    issuerMetadataService: OIDC4VCIssuerMetadataService,
+    issuerMetadataService: OID4VCIIssuerMetadataService,
     agentBaseUrl: URL
 ) extends CredentialIssuerController {
 
@@ -326,12 +326,12 @@ case class CredentialIssuerControllerImpl(
 
 object CredentialIssuerControllerImpl {
   val layer
-      : URLayer[AppConfig & OIDCCredentialIssuerService & OIDC4VCIssuerMetadataService, CredentialIssuerController] =
+      : URLayer[AppConfig & OIDCCredentialIssuerService & OID4VCIIssuerMetadataService, CredentialIssuerController] =
     ZLayer.fromZIO(
       for {
         agentBaseUrl <- ZIO.serviceWith[AppConfig](_.agent.httpEndpoint.publicEndpointUrl)
         oidcIssuerService <- ZIO.service[OIDCCredentialIssuerService]
-        oidcIssuerMetadataService <- ZIO.service[OIDC4VCIssuerMetadataService]
+        oidcIssuerMetadataService <- ZIO.service[OID4VCIIssuerMetadataService]
       } yield CredentialIssuerControllerImpl(oidcIssuerService, oidcIssuerMetadataService, agentBaseUrl)
     )
 }
diff --git a/...ntus/oidc4vc/domain/IssuanceSession.scala → ...ntus/oid4vci/domain/IssuanceSession.scala b/...ntus/oidc4vc/domain/IssuanceSession.scala → ...ntus/oid4vci/domain/IssuanceSession.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.domain
+package org.hyperledger.identus.oid4vci.domain
 
 import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
 import org.hyperledger.identus.castor.core.model.did.DID

diff --git a/...us/oidc4vc/http/AuthorizationErrors.scala → ...us/oid4vci/http/AuthorizationErrors.scala b/...us/oidc4vc/http/AuthorizationErrors.scala → ...us/oid4vci/http/AuthorizationErrors.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import org.hyperledger.identus.api.http.EndpointOutputs.statusCodeMatcher
 import org.hyperledger.identus.api.http.ErrorResponse

diff --git a/...idc4vc/http/CredentialConfiguration.scala → ...id4vci/http/CredentialConfiguration.scala b/...idc4vc/http/CredentialConfiguration.scala → ...id4vci/http/CredentialConfiguration.scala
@@ -1,6 +1,6 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration as PolluxCredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialConfiguration as PolluxCredentialConfiguration
 import sttp.tapir.Schema
 import zio.json.*
 

diff --git a/...entus/oidc4vc/http/CredentialIssuer.scala → ...entus/oid4vci/http/CredentialIssuer.scala b/...entus/oidc4vc/http/CredentialIssuer.scala → ...entus/oid4vci/http/CredentialIssuer.scala
@@ -1,6 +1,6 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer as PolluxCredentialIssuer
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialIssuer as PolluxCredentialIssuer
 import sttp.tapir.Schema
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
 

diff --git a/...dentus/oidc4vc/http/CredentialOffer.scala → ...dentus/oid4vci/http/CredentialOffer.scala b/...dentus/oidc4vc/http/CredentialOffer.scala → ...dentus/oid4vci/http/CredentialOffer.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import sttp.tapir.Schema
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}

diff --git a/...oidc4vc/http/CredentialOfferRequest.scala → ...oid4vci/http/CredentialOfferRequest.scala b/...oidc4vc/http/CredentialOfferRequest.scala → ...oid4vci/http/CredentialOfferRequest.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import sttp.tapir.Schema
 import sttp.tapir.json.zio.schemaForZioJsonValue

diff --git a/...ntus/oidc4vc/http/CredentialRequest.scala → ...ntus/oid4vci/http/CredentialRequest.scala b/...ntus/oidc4vc/http/CredentialRequest.scala → ...ntus/oid4vci/http/CredentialRequest.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import org.hyperledger.identus.pollux.core.model.CredentialFormat as PolluxCredentialFormat
 import sttp.tapir.Schema

diff --git a/...tus/oidc4vc/http/CredentialResponse.scala → ...tus/oid4vci/http/CredentialResponse.scala b/...tus/oidc4vc/http/CredentialResponse.scala → ...tus/oid4vci/http/CredentialResponse.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.encodedName

diff --git a/...identus/oidc4vc/http/IssuerMetadata.scala → ...identus/oid4vci/http/IssuerMetadata.scala b/...identus/oidc4vc/http/IssuerMetadata.scala → ...identus/oid4vci/http/IssuerMetadata.scala
@@ -1,6 +1,6 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
-import org.hyperledger.identus.pollux.core.model.oidc4vc as pollux
+import org.hyperledger.identus.pollux.core.model.oid4vci as pollux
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.encodedName
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}
@@ -25,7 +25,7 @@ object IssuerMetadata {
       issuer: pollux.CredentialIssuer,
       credentialConfigurations: Seq[pollux.CredentialConfiguration]
   ): IssuerMetadata = {
-    val credentialIssuerBaseUrl = agentBaseUrl.toURI().resolve(s"oidc4vc/issuers/${issuer.id}").toString
+    val credentialIssuerBaseUrl = agentBaseUrl.toURI().resolve(s"oid4vci/issuers/${issuer.id}").toString
     IssuerMetadata(
       credential_issuer = credentialIssuerBaseUrl,
       authorization_servers = Some(Seq(issuer.authorizationServer.toString())),

diff --git a/...r/identus/oidc4vc/http/NonceRequest.scala → ...r/identus/oid4vci/http/NonceRequest.scala b/...r/identus/oidc4vc/http/NonceRequest.scala → ...r/identus/oid4vci/http/NonceRequest.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import sttp.tapir.Schema
 import zio.json.{DeriveJsonDecoder, DeriveJsonEncoder, JsonDecoder, JsonEncoder}

diff --git a/.../identus/oidc4vc/http/NonceResponse.scala → .../identus/oid4vci/http/NonceResponse.scala b/.../identus/oidc4vc/http/NonceResponse.scala → .../identus/oid4vci/http/NonceResponse.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.http
+package org.hyperledger.identus.oid4vci.http
 
 import sttp.tapir.Schema
 import sttp.tapir.Schema.annotations.encodedName

diff --git a/...dentus/oidc4vc/service/NonceService.scala → ...dentus/oid4vci/service/NonceService.scala b/...dentus/oidc4vc/service/NonceService.scala → ...dentus/oid4vci/service/NonceService.scala
@@ -1,6 +1,6 @@
-package org.hyperledger.identus.oidc4vc.service
+package org.hyperledger.identus.oid4vci.service
 
-import org.hyperledger.identus.oidc4vc.service.NonceService.NonceGenerator
+import org.hyperledger.identus.oid4vci.service.NonceService.NonceGenerator
 import zio.Task
 
 import java.time.Instant

diff --git a/...service/OIDCCredentialIssuerService.scala → ...service/OIDCCredentialIssuerService.scala b/...service/OIDCCredentialIssuerService.scala → ...service/OIDCCredentialIssuerService.scala
@@ -1,12 +1,12 @@
-package org.hyperledger.identus.oidc4vc.service
+package org.hyperledger.identus.oid4vci.service
 
 import io.circe.Json
 import org.hyperledger.identus.agent.walletapi.storage.DIDNonSecretStorage
 import org.hyperledger.identus.castor.core.model.did.CanonicalPrismDID
 import org.hyperledger.identus.castor.core.model.did.{PrismDID, VerificationRelationship}
-import org.hyperledger.identus.oidc4vc.domain.IssuanceSession
-import org.hyperledger.identus.oidc4vc.http.*
-import org.hyperledger.identus.oidc4vc.storage.IssuanceSessionStorage
+import org.hyperledger.identus.oid4vci.domain.IssuanceSession
+import org.hyperledger.identus.oid4vci.http.*
+import org.hyperledger.identus.oid4vci.storage.IssuanceSessionStorage
 import org.hyperledger.identus.pollux.core.service.CredentialService
 import org.hyperledger.identus.pollux.vc.jwt.{DID, Issuer, JWT, JwtCredential, W3cCredentialPayload}
 import org.hyperledger.identus.shared.models.{WalletAccessContext, WalletId}

diff --git a/...c4vc/storage/IssuanceSessionStorage.scala → ...4vci/storage/IssuanceSessionStorage.scala b/...c4vc/storage/IssuanceSessionStorage.scala → ...4vci/storage/IssuanceSessionStorage.scala
@@ -1,6 +1,6 @@
-package org.hyperledger.identus.oidc4vc.storage
+package org.hyperledger.identus.oid4vci.storage
 
-import org.hyperledger.identus.oidc4vc.domain.IssuanceSession
+import org.hyperledger.identus.oid4vci.domain.IssuanceSession
 import zio.{IO, ULayer, ZIO, ZLayer}
 
 import scala.collection.concurrent.TrieMap

diff --git a/...dentus/oidc4vc/storage/NonceStorage.scala → ...dentus/oid4vci/storage/NonceStorage.scala b/...dentus/oidc4vc/storage/NonceStorage.scala → ...dentus/oid4vci/storage/NonceStorage.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.oidc4vc.storage
+package org.hyperledger.identus.oid4vci.storage
 
 trait NonceStorage {
   def getNonce(nonceExpiresAt: Long): String

diff --git a/...gent/service/server/src/test/scala/org/hyperledger/identus/api/util/Tapir2StaticOAS.scala b/...gent/service/server/src/test/scala/org/hyperledger/identus/api/util/Tapir2StaticOAS.scala
@@ -10,7 +10,7 @@ import org.hyperledger.identus.iam.authentication.DefaultAuthenticator
 import org.hyperledger.identus.iam.entity.http.controller.EntityController
 import org.hyperledger.identus.iam.wallet.http.controller.WalletManagementController
 import org.hyperledger.identus.issue.controller.IssueController
-import org.hyperledger.identus.oidc4vc.controller.CredentialIssuerController
+import org.hyperledger.identus.oid4vci.controller.CredentialIssuerController
 import org.hyperledger.identus.pollux.credentialdefinition.controller.CredentialDefinitionController
 import org.hyperledger.identus.pollux.credentialschema.controller.{
   CredentialSchemaController,

diff --git a/...ain/OIDCCredentialIssuerServiceSpec.scala → ...ain/OIDCCredentialIssuerServiceSpec.scala b/...ain/OIDCCredentialIssuerServiceSpec.scala → ...ain/OIDCCredentialIssuerServiceSpec.scala
@@ -1,13 +1,13 @@
-package org.hyperledger.identus.oidc4vc.domain
+package org.hyperledger.identus.oid4vci.domain
 
 import org.hyperledger.identus.agent.walletapi.memory.GenericSecretStorageInMemory
 import org.hyperledger.identus.agent.walletapi.service.{ManagedDIDService, MockManagedDIDService}
 import org.hyperledger.identus.agent.walletapi.storage.{DIDNonSecretStorage, MockDIDNonSecretStorage}
 import org.hyperledger.identus.castor.core.model.did.VerificationRelationship
 import org.hyperledger.identus.castor.core.service.{DIDService, MockDIDService}
-import org.hyperledger.identus.oidc4vc.http.{ClaimDescriptor, CredentialDefinition, Localization}
-import org.hyperledger.identus.oidc4vc.service.{OIDCCredentialIssuerService, OIDCCredentialIssuerServiceImpl}
-import org.hyperledger.identus.oidc4vc.storage.InMemoryIssuanceSessionService
+import org.hyperledger.identus.oid4vci.http.{ClaimDescriptor, CredentialDefinition, Localization}
+import org.hyperledger.identus.oid4vci.service.{OIDCCredentialIssuerService, OIDCCredentialIssuerServiceImpl}
+import org.hyperledger.identus.oid4vci.storage.InMemoryIssuanceSessionService
 import org.hyperledger.identus.pollux.core.repository.{
   CredentialRepository,
   CredentialRepositoryInMemory,

diff --git a/examples/st-oidc4vc/README.md → examples/st-oid4vci/README.md b/examples/st-oidc4vc/README.md → examples/st-oid4vci/README.md
diff --git a/...s/st-oidc4vc/bootstrap/01_init_realm.hurl → ...s/st-oid4vci/bootstrap/01_init_realm.hurl b/...s/st-oidc4vc/bootstrap/01_init_realm.hurl → ...s/st-oid4vci/bootstrap/01_init_realm.hurl
diff --git a/examples/st-oidc4vc/compose.yaml → examples/st-oid4vci/compose.yaml b/examples/st-oidc4vc/compose.yaml → examples/st-oid4vci/compose.yaml
diff --git a/examples/st-oidc4vc/demo.py → examples/st-oid4vci/demo.py b/examples/st-oidc4vc/demo.py → examples/st-oid4vci/demo.py
@@ -66,7 +66,7 @@ def prepare_issuer():
 
     global CREDENTIAL_ISSUER
     canonical_did = issuer_did["did"]
-    CREDENTIAL_ISSUER = f"{AGENT_URL}/oidc4vc/{canonical_did}"
+    CREDENTIAL_ISSUER = f"{AGENT_URL}/oid4vci/{canonical_did}"
     print(f"CREDENTIAL_ISSUER: {CREDENTIAL_ISSUER}")
 
 

diff --git a/...del/oidc4vc/CredentialConfiguration.scala → ...del/oid4vci/CredentialConfiguration.scala b/...del/oidc4vc/CredentialConfiguration.scala → ...del/oid4vci/CredentialConfiguration.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.pollux.core.model.oidc4vc
+package org.hyperledger.identus.pollux.core.model.oid4vci
 
 import org.hyperledger.identus.pollux.core.model.CredentialFormat
 

diff --git a/...core/model/oidc4vc/CredentialIssuer.scala → ...core/model/oid4vci/CredentialIssuer.scala b/...core/model/oidc4vc/CredentialIssuer.scala → ...core/model/oid4vci/CredentialIssuer.scala
@@ -1,4 +1,4 @@
-package org.hyperledger.identus.pollux.core.model.oidc4vc
+package org.hyperledger.identus.pollux.core.model.oid4vci
 
 import java.net.URL
 import java.time.Instant

diff --git a/...cala/org/hyperledger/identus/pollux/core/repository/OIDC4VCIssuerMetadataRepository.scala b/...cala/org/hyperledger/identus/pollux/core/repository/OIDC4VCIssuerMetadataRepository.scala
@@ -1,7 +1,7 @@
 package org.hyperledger.identus.pollux.core.repository
 
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialIssuer
 import org.hyperledger.identus.shared.models.WalletAccessContext
 import zio.*
 

diff --git a/...ervice/OIDC4VCIssuerMetadataService.scala → ...ervice/OID4VCIIssuerMetadataService.scala b/...ervice/OIDC4VCIssuerMetadataService.scala → ...ervice/OID4VCIIssuerMetadataService.scala
@@ -4,8 +4,8 @@ import org.hyperledger.identus.pollux.core.model.CredentialFormat
 import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError.CredentialSchemaParsingError
 import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError.SchemaError
 import org.hyperledger.identus.pollux.core.model.error.CredentialSchemaError.URISyntaxError
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialIssuer
 import org.hyperledger.identus.pollux.core.model.schema.CredentialSchema
 import org.hyperledger.identus.pollux.core.repository.OIDC4VCIssuerMetadataRepository
 import org.hyperledger.identus.pollux.core.service.OIDC4VCIssuerMetadataServiceError.CredentialConfigurationNotFound
@@ -53,7 +53,7 @@ object OIDC4VCIssuerMetadataServiceError {
       )
 }
 
-trait OIDC4VCIssuerMetadataService {
+trait OID4VCIIssuerMetadataService {
   def getCredentialIssuer(issuerId: UUID): IO[IssuerIdNotFound, CredentialIssuer]
   def createCredentialIssuer(authorizationServer: URL): URIO[WalletAccessContext, CredentialIssuer]
   def getCredentialIssuers: URIO[WalletAccessContext, Seq[CredentialIssuer]]
@@ -81,8 +81,8 @@ trait OIDC4VCIssuerMetadataService {
   ): ZIO[WalletAccessContext, CredentialConfigurationNotFound, Unit]
 }
 
-class OIDC4VCIssuerMetadataServiceImpl(repository: OIDC4VCIssuerMetadataRepository, uriDereferencer: URIDereferencer)
-    extends OIDC4VCIssuerMetadataService {
+class OID4VCIIssuerMetadataServiceImpl(repository: OIDC4VCIssuerMetadataRepository, uriDereferencer: URIDereferencer)
+    extends OID4VCIIssuerMetadataService {
 
   override def createCredentialIssuer(authorizationServer: URL): URIO[WalletAccessContext, CredentialIssuer] = {
     val issuer = CredentialIssuer(authorizationServer)
@@ -175,8 +175,8 @@ class OIDC4VCIssuerMetadataServiceImpl(repository: OIDC4VCIssuerMetadataReposito
       }
 }
 
-object OIDC4VCIssuerMetadataServiceImpl {
-  def layer: URLayer[OIDC4VCIssuerMetadataRepository & URIDereferencer, OIDC4VCIssuerMetadataService] = {
-    ZLayer.fromFunction(OIDC4VCIssuerMetadataServiceImpl(_, _))
+object OID4VCIIssuerMetadataServiceImpl {
+  def layer: URLayer[OIDC4VCIssuerMetadataRepository & URIDereferencer, OID4VCIIssuerMetadataService] = {
+    ZLayer.fromFunction(OID4VCIIssuerMetadataServiceImpl(_, _))
   }
 }
diff --git a/...a/org/hyperledger/identus/pollux/sql/repository/JdbcOIDC4VCIssuerMetadataRepository.scala b/...a/org/hyperledger/identus/pollux/sql/repository/JdbcOIDC4VCIssuerMetadataRepository.scala
@@ -4,8 +4,8 @@ import doobie.*
 import doobie.implicits.*
 import doobie.postgres.implicits.*
 import doobie.util.transactor.Transactor
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialConfiguration
-import org.hyperledger.identus.pollux.core.model.oidc4vc.CredentialIssuer
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialConfiguration
+import org.hyperledger.identus.pollux.core.model.oid4vci.CredentialIssuer
 import org.hyperledger.identus.pollux.core.repository.OIDC4VCIssuerMetadataRepository
 import org.hyperledger.identus.shared.db.ContextAwareTask
 import org.hyperledger.identus.shared.db.Implicits.*