diff --git a/rsdo5.json b/rsdo5.json
index 7b47457..77858b9 100644
--- a/rsdo5.json
+++ b/rsdo5.json
@@ -356,7 +356,7 @@
                 "summary": "Vrne binarni zapis v originalnem formatu po id-ju datoteke",
                 "operationId": "getFile",
                 "parameters": [{
-                    "name": "id",
+                    "name": "file_id",
                     "in": "query",
                     "required": true,
                     "schema": {
@@ -453,7 +453,7 @@
                 "summary": "Vrne CoNNL-U po id-ju datoteke",
                 "operationId": "getConllu",
                 "parameters": [{
-                    "name": "id",
+                    "name": "file_id",
                     "in": "query",
                     "required": true,
                     "schema": {
@@ -480,7 +480,7 @@
                 "tags": ["oss"],
                 "summary": "Vrne besedilo po id-ju datoteke",
                 "parameters": [{
-                    "name": "id",
+                    "name": "file_id",
                     "in": "query",
                     "required": true,
                     "schema": {
diff --git a/swagger_server/controllers/oss_controller.py b/swagger_server/controllers/oss_controller.py
index fcb44b6..ca6a8a8 100644
--- a/swagger_server/controllers/oss_controller.py
+++ b/swagger_server/controllers/oss_controller.py
@@ -5,13 +5,13 @@ from swagger_server.models.terminoloski_kandidat import TerminoloskiKandidat  #
 from swagger_server import util
 
 
-def get_conllu(id):  # noqa: E501
+def get_conllu(file_id):  # noqa: E501
     """Vrne CoNNL-U po id-ju datoteke
 
      # noqa: E501
 
-    :param id: 
-    :type id: int
+    :param file_id:
+    :type file_id: int
 
     :rtype: str
     """
@@ -56,13 +56,13 @@ def get_extracted_words(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E50
     return 'do some magic!'
 
 
-def get_file(id):  # noqa: E501
+def get_file(file_id):  # noqa: E501
     """Vrne binarni zapis v originalnem formatu po id-ju datoteke
 
      # noqa: E501
 
-    :param id: 
-    :type id: int
+    :param file_id:
+    :type file_id: int
 
     :rtype: List[bytearray]
     """
@@ -126,13 +126,13 @@ def get_texts(leta, vrste, kljucnebesede, cerifpodrocja):  # noqa: E501
     return 'do some magic!'
 
 
-def oss_besedilo_po_id_get(id):  # noqa: E501
+def oss_besedilo_po_id_get(file_id):  # noqa: E501
     """Vrne besedilo po id-ju datoteke
 
      # noqa: E501
 
-    :param id: 
-    :type id: int
+    :param file_id:
+    :type file_id: int
 
     :rtype: str
     """
diff --git a/swagger_server/swagger/swagger.yaml b/swagger_server/swagger/swagger.yaml
index 0e03347..7e4d258 100644
--- a/swagger_server/swagger/swagger.yaml
+++ b/swagger_server/swagger/swagger.yaml
@@ -270,7 +270,7 @@ paths:
       summary: Vrne binarni zapis v originalnem formatu po id-ju datoteke
       operationId: get_file
       parameters:
-      - name: id
+      - name: file_id
         in: query
         required: true
         style: form
@@ -353,7 +353,7 @@ paths:
       summary: Vrne CoNNL-U po id-ju datoteke
       operationId: get_conllu
       parameters:
-      - name: id
+      - name: file_id
         in: query
         required: true
         style: form
@@ -377,7 +377,7 @@ paths:
       summary: Vrne besedilo po id-ju datoteke
       operationId: oss_besedilo_po_id_get
       parameters:
-      - name: id
+      - name: file_id
         in: query
         required: true
         style: form
diff --git a/swagger_server/test/test_oss_controller.py b/swagger_server/test/test_oss_controller.py
index af0569d..f9d71b0 100644
--- a/swagger_server/test/test_oss_controller.py
+++ b/swagger_server/test/test_oss_controller.py
@@ -17,7 +17,7 @@ class TestOssController(BaseTestCase):
 
         Vrne CoNNL-U po id-ju datoteke
         """
-        query_string = [('id', 789)]
+        query_string = [('file_id', 789)]
         response = self.client.open(
             '/oss/conlluPoId',
             method='GET',
@@ -62,7 +62,7 @@ class TestOssController(BaseTestCase):
 
         Vrne binarni zapis v originalnem formatu po id-ju datoteke
         """
-        query_string = [('id', 789)]
+        query_string = [('file_id', 789)]
         response = self.client.open(
             '/oss/datotekaPoId',
             method='GET',
@@ -123,7 +123,7 @@ class TestOssController(BaseTestCase):
 
         Vrne besedilo po id-ju datoteke
         """
-        query_string = [('id', 789)]
+        query_string = [('file_id', 789)]
         response = self.client.open(
             '/oss/besediloPoId',
             method='GET',