diff --git a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/advices/ServerInfoAdvice.kt b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/advices/ServerInfoAdvice.kt
index 1a6a4fb..8cbff61 100644
--- a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/advices/ServerInfoAdvice.kt
+++ b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/advices/ServerInfoAdvice.kt
@@ -7,11 +7,11 @@ import org.springframework.http.server.ServerHttpRequest
 import org.springframework.http.server.ServerHttpResponse
 import org.springframework.web.bind.annotation.RestControllerAdvice
 import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice
-import ru.touchin.server.info.services.ServerInfoService
+import ru.touchin.server.info.services.ServerInfoHeader
 
 @RestControllerAdvice
 class ServerInfoAdvice(
-    private val serverInfoService: List<ServerInfoService>
+    private val serverInfoHeaders: List<ServerInfoHeader>
 ) : ResponseBodyAdvice<Any> {
 
     override fun supports(
@@ -29,7 +29,7 @@ class ServerInfoAdvice(
         request: ServerHttpRequest,
         response: ServerHttpResponse
     ): Any? {
-        for (service in serverInfoService) {
+        for (service in serverInfoHeaders) {
             response
                 .headers
                 .addAll(
diff --git a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoService.kt b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoHeader.kt
similarity index 82%
rename from server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoService.kt
rename to server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoHeader.kt
index 91ef640..acbc17c 100644
--- a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoService.kt
+++ b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoHeader.kt
@@ -2,7 +2,7 @@ package ru.touchin.server.info.services
 
 import org.springframework.util.MultiValueMap
 
-interface ServerInfoService {
+interface ServerInfoHeader {
 
     fun getHeaders(): MultiValueMap<String, String>
 
diff --git a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionServiceImpl.kt b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionHeader.kt
similarity index 76%
rename from server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionServiceImpl.kt
rename to server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionHeader.kt
index 1700d3a..cb43972 100644
--- a/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionServiceImpl.kt
+++ b/server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionHeader.kt
@@ -1,15 +1,15 @@
 package ru.touchin.server.info.services.version
 
-import org.springframework.stereotype.Service
+import org.springframework.stereotype.Component
 import org.springframework.util.LinkedMultiValueMap
 import org.springframework.util.MultiValueMap
 import ru.touchin.server.info.services.version.properties.ServerInfoProperties
-import ru.touchin.server.info.services.ServerInfoService
+import ru.touchin.server.info.services.ServerInfoHeader
 
-@Service
-class BuildVersionServiceImpl(
+@Component
+class BuildVersionHeader(
     private val serverInfoProperties: ServerInfoProperties
-) : ServerInfoService {
+) : ServerInfoHeader {
 
     override fun getHeaders(): MultiValueMap<String, String> {
         return LinkedMultiValueMap<String, String>()
diff --git a/server-info-spring-web/src/test/resources/application-test.yml b/server-info-spring-web/src/test/resources/application-test.yml
index 2485a77..084909a 100644
--- a/server-info-spring-web/src/test/resources/application-test.yml
+++ b/server-info-spring-web/src/test/resources/application-test.yml
@@ -1,2 +1,3 @@
-server.info:
-  buildVersion: 1
+server:
+  info:
+    buildVersion: 1