diff --git a/src/en/OInt/core/Modules/OPI_Airtable.os b/src/en/OInt/core/Modules/OPI_Airtable.os
index 815ad996f9..cc87302466 100644
--- a/src/en/OInt/core/Modules/OPI_Airtable.os
+++ b/src/en/OInt/core/Modules/OPI_Airtable.os
@@ -47,7 +47,7 @@
 // Indent - String - Next page identifier of the base list from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable 
+// Map Of KeyAndValue - serialized JSON response from Airtable 
 Function GetListOfBases(Val Token, Val Indent = "") Export
     
     OPI_TypeConversion.GetLine(Indent);
@@ -72,7 +72,7 @@ EndFunction
 // Base - String - Base identifier - base
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetDatabaseTables(Val Token, Val Base) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -93,10 +93,10 @@ EndFunction
 // Token - String - Token - token
 // Workspace - String - Workspace identifier - ws
 // Name - String - New base name - title
-// TableCollection - Key-Value Pair - Table description: Key > name, Value > array of fields - tablesdata
+// TableCollection - Map Of KeyAndValue - Table description: Key > name, Value > array of fields - tablesdata
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateDatabase(Val Token, Val Workspace, Val Name, Val TableCollection) Export
     
     OPI_TypeConversion.GetCollection(TableCollection);
@@ -145,7 +145,7 @@ EndFunction
 // Description - String - Table description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateTable(Val Token, Val Base, Val Name, Val FieldArray, Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -171,7 +171,7 @@ EndFunction
 // Description - String - New description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function ModifyTable(Val Token, Val Base, Val Table, Val Name = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -204,7 +204,7 @@ EndFunction
 // FieldStructure - Structure of Key-Value - Description of the new field - fielddata
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateField(Val Token, Val Base, Val Table, Val FieldStructure) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -239,7 +239,7 @@ EndFunction
 // Description - String - New description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function ModifyField(Val Token, Val Base, Val Table, Val Field, Val Name = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -389,7 +389,7 @@ EndFunction
 // Indent - String - Next page identifier of data from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetListOfRecords(Val Token, Val Base, Val Table, Val Indent = "") Export
 
     OPI_TypeConversion.GetLine(Base);
@@ -417,7 +417,7 @@ EndFunction
 // Record - String - Record identifier in the table - record
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetRecord(Val Token, Val Base, Val Table, Val Record) Export
    
     OPI_TypeConversion.GetLine(Base);
@@ -443,7 +443,7 @@ EndFunction
 // Data - Structure, Array of Structure - Set or array of sets of Key : Value pairs > Field : Indicator - data
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreatePosts(Val Token, Val Base, Val Table, Val Data) Export
 
     OPI_TypeConversion.GetLine(Base);
@@ -472,7 +472,7 @@ EndFunction
 // Records - String, Array of String - Identifier or array of record identifiers - records
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function DeletePosts(Val Token, Val Base, Val Table, Val Records) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -512,7 +512,7 @@ EndFunction
 // Indent - String - Next page identifier of data from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetComments(Val Token, Val Base, Val Table, Val Record, Val Indent = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -542,7 +542,7 @@ EndFunction
 // Text - String - Comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateComment(Val Token, Val Base, Val Table, Val Record, Val Text) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -573,7 +573,7 @@ EndFunction
 // Text - String - New comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function EditComment(Val Token, Val Base, Val Table, Val Record, Val Comment, Val Text) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -604,7 +604,7 @@ EndFunction
 // Comment - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable 
+// Map Of KeyAndValue - serialized JSON response from Airtable 
 Function DeleteComment(Val Token, Val Base, Val Table, Val Record, Val Comment) Export
 
     OPI_TypeConversion.GetLine(Base);
diff --git a/src/en/OInt/core/Modules/OPI_Dropbox.os b/src/en/OInt/core/Modules/OPI_Dropbox.os
index 4e41b80f67..66d9d10d1a 100644
--- a/src/en/OInt/core/Modules/OPI_Dropbox.os
+++ b/src/en/OInt/core/Modules/OPI_Dropbox.os
@@ -65,7 +65,7 @@ EndFunction
 // Code - String - Code from the authorization page - code
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
     
     URL = "https://api.dropbox.com/oauth2/token";
@@ -103,7 +103,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function RefreshToken(Val AppKey, Val AppSecret, Val RefreshToken) Export
     
     String_ = "String";
@@ -129,7 +129,7 @@ EndFunction
 // Account - String - Account ID. Current token account if not filled - account
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetAccountInformation(Val Token, Val Account = "") Export
     
     If ValueIsFilled(Account) Then
@@ -149,7 +149,7 @@ EndFunction
 // Token - String - Token - token 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetSpaceUsageData(Val Token) Export
     
     URL = "https://api.dropboxapi.com/2/users/get_space_usage";
@@ -178,7 +178,7 @@ EndFunction
 // Detailed - Boolean - Adds additional information fields for media files - detail 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox 
+// Map Of KeyAndValue - serialized JSON response from Dropbox 
 Function GetObjectInformation(Val Token, Val Path, Val Detailed = False) Export
     
     URL = "https://api.dropboxapi.com/2/files/get_metadata"; 
@@ -260,7 +260,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite file in case of path conflicts - overwrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox 
+// Map Of KeyAndValue - serialized JSON response from Dropbox 
 Function UploadFile(Val Token, Val File, Val Path, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetBinaryData(File);
@@ -290,7 +290,7 @@ EndFunction
 // Path - String - Save path on Dropbox - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function UploadFileByURL(Val Token, Val FileURL, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/files/save_url"; 
@@ -314,7 +314,7 @@ EndFunction
 // JobID - String - ID of the asynchronous job from the UploadFileByURL response - job 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetUploadStatusByURL(Val Token, Val JobID) Export
     
     URL = "https://api.dropboxapi.com/2/files/save_url/check_job_status"; 
@@ -338,7 +338,7 @@ EndFunction
 // Irrecoverable - String - Delete object without the possibility of recovery - permanently
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function DeleteObject(Val Token, Val Path, Val Irrecoverable = False) Export
     
     OPI_TypeConversion.GetBoolean(Irrecoverable);
@@ -364,7 +364,7 @@ EndFunction
 // Target - String - Target path for the new object - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CopyObject(Val Token, Val From, Val Target) Export
    
     URL = "https://api.dropboxapi.com/2/files/copy_v2";
@@ -390,7 +390,7 @@ EndFunction
 // Target - String - Target path for the new object - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function MoveObject(Val Token, Val From, Val Target) Export
 
     URL = "https://api.dropboxapi.com/2/files/move_v2";
@@ -415,7 +415,7 @@ EndFunction
 // Path - String - Target path for creating the directory - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CreateFolder(Val Token, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/files/create_folder_v2";
@@ -470,7 +470,7 @@ EndFunction
 // Count - String, Number - Number of the latest versions of the object to display - amount
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetObjectVersionList(Val Token, Val Path, Val Count = 10) Export
     
     URL = "https://api.dropboxapi.com/2/files/list_revisions"; 
@@ -495,7 +495,7 @@ EndFunction
 // Version - String - ID of the version (revision) for restoration - rev
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function RestoreObjectToVersion(Val Token, Val Path, Val Version) Export
     
     URL = "https://api.dropboxapi.com/2/files/restore"; 
@@ -523,7 +523,7 @@ EndFunction
 // Paths - String, Array of String - Path or set of paths to the files - paths
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetTagList(Val Token, Val Paths) Export
     
     URL = "https://api.dropboxapi.com/2/files/tags/get";
@@ -548,7 +548,7 @@ EndFunction
 // Tag - String - Tag text - tag
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function AddTag(Val Token, Val Path, Val Tag) Export
     
     Return ProcessTag(Token, Path, Tag);
@@ -564,7 +564,7 @@ EndFunction
 // Tag - String - Tag text - tag
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function DeleteTag(Val Token, Val Path, Val Tag) Export
     
     Return ProcessTag(Token, Path, Tag, True);
@@ -583,7 +583,7 @@ EndFunction
 // Path - String - Path to the target directory - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function PublishFolder(Val Token, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/share_folder";
@@ -601,7 +601,7 @@ EndFunction
 // FolderID - String - ID of the public catalog (shared folder ID) - folder
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CancelFolderPublication(Val Token, Val FolderID) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/unshare_folder";
@@ -626,7 +626,7 @@ EndFunction
 // ViewOnly - Boolean - Prohibits file editing for the external user - readonly
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function AddUsersToFile(Val Token, Val FileID, Val EmailAddresses, Val ViewOnly = True) Export
     
     String_ = "String";
@@ -724,7 +724,7 @@ EndFunction
 // JobID - String - AsynchronousJobID - job
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetAsynchronousChangeStatus(Val Token, Val JobID) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/check_job_status";
@@ -747,7 +747,7 @@ EndFunction
 // FileID - String - ID of the file to be accessed - fileid
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CancelFilePublication(Val Token, Val FileID) Export
 	
 	OPI_TypeConversion.GetLine(FileID);
diff --git a/src/en/OInt/core/Modules/OPI_GoogleCalendar.os b/src/en/OInt/core/Modules/OPI_GoogleCalendar.os
index a7b7f801e4..401c87bc0c 100644
--- a/src/en/OInt/core/Modules/OPI_GoogleCalendar.os
+++ b/src/en/OInt/core/Modules/OPI_GoogleCalendar.os
@@ -48,7 +48,7 @@
 // Name - String - Name of the created calendar - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateCalendar(Val Token, Val Name) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -75,7 +75,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCalendarMetadata(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -99,7 +99,7 @@ EndFunction
 // Description - String - New calendar description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditCalendarMetadata(Val Token
     , Val Calendar
     , Val Name = ""
@@ -136,7 +136,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function ClearMainCalendar(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -157,7 +157,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteCalendar(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -182,7 +182,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Array of calendar data mappings
+// Map Of KeyAndValue - Array of calendar data mappings
 Function GetCalendarList(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -204,7 +204,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function AddCalendarToList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -230,7 +230,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetListCalendar(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -252,7 +252,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteCalendarFromList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -277,7 +277,7 @@ EndFunction
 // Hidden - Boolean - Hidden calendar - hidden
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditListCalendar(Val Token
     , Val Calendar
     , Val PrimaryColor
@@ -311,7 +311,7 @@ EndFunction
 // Get event description !NOCLI
 // 
 // Returns:
-// Key-Value Pair - Empty event template
+// Map Of KeyAndValue - Empty event template
 Function GetEventDescription() Export
     
     CurrentDate = OPI_Tools.GetCurrentDate();
@@ -338,7 +338,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - Array of event mappings
+// Map Of KeyAndValue - Array of event maps
 Function GetEventList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -362,7 +362,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetEvent(Val Token, Val Calendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -387,7 +387,7 @@ EndFunction
 // Parameters:
 // Token - String - Token - token         
 // Calendar - String - Calendar ID - calendar
-// EventDescription - Key-Value Pair - Event description - props
+// EventDescription - Map Of KeyAndValue - Event description - props
 // 
 // Returns:
 // String, Arbitrary, HTTPResponse, BinaryData, Undefined - Google server response
@@ -405,7 +405,7 @@ EndFunction
 // Event - String - ID of the source calendar event - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function MoveEvent(Val Token, Val SourceCalendar, Val TargetCalendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -437,7 +437,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditEvent(Val Token, Val Calendar, Val EventDescription, Val Event) Export
     Return EventManagement(Token, Calendar, EventDescription, Event);
 EndFunction
@@ -451,7 +451,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteEvent(Val Token, Val Calendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OInt/core/Modules/OPI_GoogleDrive.os b/src/en/OInt/core/Modules/OPI_GoogleDrive.os
index 2d95ef06ef..54e110ea1a 100644
--- a/src/en/OInt/core/Modules/OPI_GoogleDrive.os
+++ b/src/en/OInt/core/Modules/OPI_GoogleDrive.os
@@ -48,7 +48,7 @@
 // Identifier - String - Identifier of the file or folder - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetObjectInformation(Val Token, Val Identifier) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -75,7 +75,7 @@ EndFunction
 // Detailed - Boolean - Adds a list of files to the directory fields - depth
 // 
 // Returns:
-// Key-Value Pair - Array of directory mappings
+// Map Of KeyAndValue - Array of directory mappings
 Function GetDirectoriesList(Val Token, Val NameContains = "", Val Detailed = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -111,7 +111,7 @@ EndFunction
 // Directory - String - Filter by parent directory ID - catalog
 // 
 // Returns:
-// Key-Value Pair - Array of file mappings
+// Map Of KeyAndValue - Array of file mappings
 Function GetFilesList(Val Token, Val NameContains = "", Val Directory = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -144,10 +144,10 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // File - BinaryData,String - File to be uploaded - file
-// Description - Key-Value Pair - See GetFileDescription - props - JSON description or path to .json
+// Description - Map Of KeyAndValue - See GetFileDescription - props - JSON description or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function UploadFile(Val Token, Val File, Val Description) Export
     Return FileManagement(Token, File, Description);   
 EndFunction
@@ -161,7 +161,7 @@ EndFunction
 // Parent - String - Parent - catalog
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateFolder(Val Token, Val Name, Val Parent = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -215,7 +215,7 @@ EndFunction
 // NewParent - String - New parent directory - catalog
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CopyObject(Val Token, Val Identifier, Val NewName = "", Val NewParent = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -256,7 +256,7 @@ EndFunction
 // NewName - String - New file name (if necessary) - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function UpdateFile(Val Token, Val Identifier, Val File, Val NewName = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -283,7 +283,7 @@ EndFunction
 // Identifier - String - Identifier of the object to delete - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteObject(Val Token, Val Identifier) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -300,7 +300,7 @@ EndFunction
 // Get file description !NOCLI
 // 
 // Returns:
-// Key-Value Pair - File description
+// Map Of KeyAndValue - File description
 Function GetFileDescription() Export
     
     Description = New Map;
@@ -326,7 +326,7 @@ EndFunction
 // Comment - String - Comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateComment(Val Token, Val Identifier, Val Comment) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -354,7 +354,7 @@ EndFunction
 // CommentID - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetComment(Val Token, Val ObjectID, Val CommentID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -381,7 +381,7 @@ EndFunction
 // ObjectID - String - Object identifier - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCommentList(Val Token, Val ObjectID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -408,7 +408,7 @@ EndFunction
 // CommentID - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteComment(Val Token, Val ObjectID, Val CommentID) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OInt/core/Modules/OPI_GoogleSheets.os b/src/en/OInt/core/Modules/OPI_GoogleSheets.os
index 65e5de8138..447e96fcc5 100644
--- a/src/en/OInt/core/Modules/OPI_GoogleSheets.os
+++ b/src/en/OInt/core/Modules/OPI_GoogleSheets.os
@@ -49,7 +49,7 @@
 // ArrayOfSheetNames - Array of String - Array of names to add new sheets to the book - sheets
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateBook(Val Token, Val Name, Val ArrayOfSheetNames) Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -81,7 +81,7 @@ EndFunction
 // Identifier - String - BookIdentifier - spreadsheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetBook(Val Token, Val Identifier) Export
 
     OPI_TypeConversion.GetLine(Identifier); 
@@ -104,7 +104,7 @@ EndFunction
 // Name - String - New name - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditBookTitle(Val Token, Val Book, Val Name) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -142,7 +142,7 @@ EndFunction
 // Name - String - NewSheetName - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function AddSheet(Val Token, Val Book, Val Name) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -172,7 +172,7 @@ EndFunction
 // Sheet - String - IdentifierOfSheetToDelete - sheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteSheet(Val Token, Val Book, Val Sheet) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -204,7 +204,7 @@ EndFunction
 // Sheet - String - CopiedSheetID - sheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CopySheet(Val Token, Val From, Val Target, Val Sheet) Export
     
     OPI_TypeConversion.GetLine(From);
@@ -235,12 +235,12 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // Book - String - BookID - spreadsheet 
-// ValueMapping - Key-Value Pair - Fill data where the key is the cell name like A1 - data
+// ValueMapping - Map Of KeyAndValue - Fill data where the key is the cell name like A1 - data
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // MajorDimension - String - Main dimension when filling the array range - dim
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function SetCellValues(Val Token
     , Val Book
     , Val ValueMapping
@@ -276,7 +276,7 @@ EndFunction
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function ClearCells(Val Token, Val Book, Val CellsArray, Val Sheet = "") Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -304,7 +304,7 @@ EndFunction
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCellValues(Val Token, Val Book, Val CellsArray = "", Val Sheet = "") Export
     
     OPI_TypeConversion.GetLine(Book);
diff --git a/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os b/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os
index 3e3c0c53f0..8c6aadf4d8 100644
--- a/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os
+++ b/src/en/OInt/core/Modules/OPI_GoogleWorkspace.os
@@ -83,7 +83,7 @@ EndFunction
 // Code - String - Code from browser - code
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetTokenByCode(Val ClientID, Val ClientSecret, Val Code) Export
     
     OPI_TypeConversion.GetLine(ClientID);
@@ -114,7 +114,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function RefreshToken(Val ClientID, Val ClientSecret, Val RefreshToken) Export
     
     OPI_TypeConversion.GetLine(ClientID);
diff --git a/src/en/OInt/core/Modules/OPI_Notion.os b/src/en/OInt/core/Modules/OPI_Notion.os
index c776669558..77e9dea5aa 100644
--- a/src/en/OInt/core/Modules/OPI_Notion.os
+++ b/src/en/OInt/core/Modules/OPI_Notion.os
@@ -52,7 +52,7 @@
 // Title - String - Page title - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreatePage(Val Token, Val Parent, Val Title) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -80,10 +80,10 @@ EndFunction
 // Parameters:
 // Token - String - Token - token 
 // Parent - String - Parent database ID - base
-// Data - Key-Value Pair - Properties match - data
+// Data - Map Of KeyAndValue - Properties map - data
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreatePageInDatabase(Val Token, Val Parent, Val Data) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -112,7 +112,7 @@ EndFunction
 // Page - String - Page ID - page 
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetPage(Val Token, Val Page) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -132,13 +132,13 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // Page - String - ID of the page being modified - page
-// Data - Key-Value Pair - Matching of editable parameters - data
+// Data - Map Of KeyAndValue - Map of editable parameters - data
 // Icon - String - URL of the page icon image - icon
 // Cover - String - URL of the page cover image - cover
 // Archived - Boolean - Archive page or not (boolean) - archive
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function EditPageProperties(Val Token
     , Val Page
     , Val Data = ""
@@ -211,7 +211,7 @@ EndFunction
 // Properties - Structure Of String - Database properties - props
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreateDatabase(Val Token, Val Parent, Val Title, Val Properties = "") Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -227,9 +227,9 @@ Function CreateDatabase(Val Token, Val Parent, Val Title, Val Properties = "") E
     // Count    : number
     // Date : date
     // Status : Map
-    // Аtoтиinный : green
+    // Аtoтandinный : green
     // Inactive    : red
-    // Архиin : yellow
+    // Архandin : yellow
     
     // All pages created as children must have parent base properties
 
@@ -258,7 +258,7 @@ EndFunction
 // Base - String - Database ID - base
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetDatabase(Val Token, Val Base) Export
    
     OPI_TypeConversion.GetLine(Token);
@@ -284,7 +284,7 @@ EndFunction
 // Description - String - New database description - description
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function EditDatabaseProperties(Val Token, Val Base, Val Properties = "", Val Title = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -329,7 +329,7 @@ EndFunction
 // InsertAfter - String - Block ID after which to insert the new one - prev
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreateBlock(Val Token, Val Parent, Val Block, Val InsertAfter = "") Export
   
     OPI_TypeConversion.GetLine(Token);
@@ -374,7 +374,7 @@ EndFunction
 // OnlyBase - Boolean - True > service fields are deleted, only the block itself remains - core
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function ReturnBlock(Val Token, Val BlockID, Val OnlyBase = True) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -402,7 +402,7 @@ EndFunction
 // BlockID - String - Parent block ID - block
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function ReturnChildBlocks(Val Token, Val BlockID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -425,7 +425,7 @@ EndFunction
 // BlockID - String - Block ID - block
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function DeleteBlock(Val Token, Val BlockID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -451,7 +451,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function UserList(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -471,7 +471,7 @@ EndFunction
 // UserID - String - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetUserData(Val Token, Val UserID) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OInt/core/Modules/OPI_Slack.os b/src/en/OInt/core/Modules/OPI_Slack.os
index 20afb48c93..682996fc12 100644
--- a/src/en/OInt/core/Modules/OPI_Slack.os
+++ b/src/en/OInt/core/Modules/OPI_Slack.os
@@ -47,7 +47,7 @@
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack 
+// Map Of KeyAndValue - Serialized JSON response from Slack 
 Function GetBotInformation(Val Token) Export
     
     URL = "https://slack.com/api/auth.test";
@@ -67,7 +67,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetWorkspaceList(Val Token, Val Cursor = "") Export
     
     URL = "https://slack.com/api/auth.teams.list";
@@ -85,7 +85,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetUserList(Val Token, Val Cursor = "") Export
     
     URL = "https://slack.com/api/users.list";
@@ -110,7 +110,7 @@ EndFunction
 // Blocks - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendMessage(Val Token, Val Channel, Val Text = "", Val SendingDate = "", Val Blocks = "") Export
       
     String_ = "String";
@@ -164,7 +164,7 @@ EndFunction
 // Blocks - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendEphemeralMessage(Val Token
     , Val Channel
     , Val Text = ""
@@ -204,7 +204,7 @@ EndFunction
 // BlockArray - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function EditMessage(Val Token, Val Channel, Val Timestamp, Val Text = "", Val BlockArray = "") Export
     
     String_ = "String";
@@ -233,7 +233,7 @@ EndFunction
 // IsDelayed - Boolean - Indicator of deleting a delayed message - issheduled
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteMessage(Val Token, Val Channel, Val Timestamp, Val IsDelayed = False) Export
     
     OPI_TypeConversion.GetBoolean(IsDelayed);
@@ -267,7 +267,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetDelayedMessageList(Val Token, Val Channel, Val Cursor = "") Export
     
     URL = "https://slack.com/api/chat.scheduledMessages.list";
@@ -292,7 +292,7 @@ EndFunction
 // Timestamp - String - Timestamp or message ID - stamp
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetMessageLink(Val Token, Val Channel, Val Timestamp) Export
     
     URL = "https://slack.com/api/chat.getPermalink";
@@ -318,7 +318,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetMessageReplyList(Val Token, Val Channel, Val Timestamp, Val Cursor = "") Export
     
     String_ = "String";
@@ -349,7 +349,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelList(Val Token, Val ExcludeArchived = False, Val Cursor = "") Export
     
     URL = "https://slack.com/api/conversations.list";
@@ -374,7 +374,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelUserList(Val Token, Val Channel, Val Cursor = "") Export
     
     URL = "https://slack.com/api/conversations.members";
@@ -399,7 +399,7 @@ EndFunction
 // Private - Boolean - Create channel as private - private
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function CreateChannel(Val Token, Val Name, Val Private = False) Export
     
     URL = "https://slack.com/api/conversations.create";
@@ -423,7 +423,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function ArchiveChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.archive";
@@ -440,7 +440,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.info";
@@ -457,7 +457,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelHistory(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.history";
@@ -475,7 +475,7 @@ EndFunction
 // ArrayOfUsers - Array Of String - User ID Array - users
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function InviteUsersToChannel(Val Token, Val Channel, Val ArrayOfUsers) Export
     
     URL = "https://slack.com/api/conversations.invite";
@@ -503,7 +503,7 @@ EndFunction
 // User - String - User ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function KickUserFromChannel(Val Token, Val Channel, Val User) Export
     
     URL = "https://slack.com/api/conversations.kick";
@@ -527,7 +527,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function JoinChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.join";
@@ -544,7 +544,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function LeaveChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.leave";
@@ -562,7 +562,7 @@ EndFunction
 // Topic - String - Channel topic - theme
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SetChannelTopic(Val Token, Val Channel, Val Topic) Export
     
     URL = "https://slack.com/api/conversations.setTopic";
@@ -587,7 +587,7 @@ EndFunction
 // Purpose - String - Channel purpose - purpose
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SetChannelGoal(Val Token, Val Channel, Val Purpose) Export
     
     URL = "https://slack.com/api/conversations.setPurpose";
@@ -612,7 +612,7 @@ EndFunction
 // Name - String - New channel name - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function RenameChannel(Val Token, Val Channel, Val Name) Export
     
     URL = "https://slack.com/api/conversations.rename";
@@ -640,7 +640,7 @@ EndFunction
 // ArrayOfUsers - Array of String - User ID Array - users
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function OpenDialog(Val Token, Val ArrayOfUsers) Export
     
     URL = "https://slack.com/api/conversations.open";
@@ -666,7 +666,7 @@ EndFunction
 // Dialog - String - Dialog ID - conv
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function CloseDialog(Val Token, Val Dialog) Export
     
     URL = "https://slack.com/api/conversations.close";
@@ -688,7 +688,7 @@ EndFunction
 // PageNumber - Number, String - Page number - page
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetFilesList(Val Token, Val Channel = "", Val PageNumber = 1) Export
     
     URL = "https://slack.com/api/files.list";
@@ -715,7 +715,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function UploadFile(Val Token, Val File, Val FileName, Val Title, Val Channel = "") Export
     
     OPI_TypeConversion.GetBinaryData(File);
@@ -767,7 +767,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetFileData(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.info";
@@ -785,7 +785,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteFile(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.delete";
@@ -803,7 +803,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function MakeFilePublic(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.sharedPublicURL";
@@ -821,7 +821,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function MakeFilePrivate(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.revokePublicURL";
@@ -844,7 +844,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetExternalFileList(Val Token, Val Channel = "", Val Cursor = "") Export
     
     URL = "https://slack.com/api/files.remote.list";
@@ -868,7 +868,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetExternalFile(Val Token, Val FileID) Export
   
     URL = "https://slack.com/api/files.remote.info";
@@ -887,7 +887,7 @@ EndFunction
 // Title - String - File title for Slack - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function AddExternalFile(Val Token, Val URL, Val Title) Export
     
     String_ = "String";
@@ -915,7 +915,7 @@ EndFunction
 // ChannelArray - Array Of String - Array of channels for sending - channels
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendExternalFile(Val Token, Val FileID, Val ChannelArray) Export
     
     URL = "https://slack.com/api/files.remote.share";
@@ -942,7 +942,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteExternalFile(Val Token, Val FileID) Export
   
     URL = "https://slack.com/api/files.remote.remove";
@@ -964,7 +964,7 @@ EndFunction
 // AlternateText - String - Alternate text of the image - alt
 // 
 // Returns:
-// Key-Value Pair - Image block
+// Map Of KeyAndValue - Image block
 Function GenerateImageBlock(Val URL, Val AlternateText = "") Export
     
     String_ = "String";
diff --git a/src/en/OInt/core/Modules/OPI_Telegram.os b/src/en/OInt/core/Modules/OPI_Telegram.os
index a22afc024a..efdeae8080 100644
--- a/src/en/OInt/core/Modules/OPI_Telegram.os
+++ b/src/en/OInt/core/Modules/OPI_Telegram.os
@@ -50,7 +50,7 @@
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetBotInformation(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -71,7 +71,7 @@ EndFunction
 // Offset - String, Number - Offset in the list of received messages - offset
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetUpdates(Val Token, Val Timeout = 0, Val Offset = "") Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -95,7 +95,7 @@ EndFunction
 // URL - String - Request handling address from Telegram (with https:) - url
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SetWebhook(Val Token, Val URL) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -117,7 +117,7 @@ EndFunction
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DeleteWebhook(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -137,7 +137,7 @@ EndFunction
 // FileID - String - File ID for downloading - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DownloadFile(Val Token, Val FileID) Export
 
     Result = "result";
@@ -178,7 +178,7 @@ Function ProcessTMAData(Val DataString, Val Token) Export
     OPI_TypeConversion.GetLine(DataString);
     
     DataString = DecodeString(DataString, StringEncodingMethod.URLencoding);
-    DataStructure = OPI_Tools.RequestParametersToMatch(DataString);
+    DataStructure = OPI_Tools.RequestParametersToMap(DataString);
     Key = "WebAppData";
     Hash = "";
     BinaryKey = GetBinaryDataFromString(Key);
@@ -245,7 +245,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendTextMessage(Val Token
 	, Val ChatID
 	, Val Text
@@ -281,7 +281,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendImage(Val Token
 	, Val ChatID
 	, Val Text
@@ -305,7 +305,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendVideo(Val Token
 	, Val ChatID
 	, Val Text
@@ -329,7 +329,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendAudio(Val Token
 	, Val ChatID
 	, Val Text
@@ -353,7 +353,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendDocument(Val Token
 	, Val ChatID
 	, Val Text
@@ -377,7 +377,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendGif(Val Token
 	, Val ChatID
 	, Val Text
@@ -401,7 +401,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendMediaGroup(Val Token
 	, Val ChatID
 	, Val Text
@@ -452,7 +452,7 @@ EndFunction
 // Keyboard - String - See GenerateKeyboardFromArray - keyboard - Keyboard JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendLocation(Val Token, Val ChatID, Val Latitude, Val Longitude, Val Keyboard = "") Export
 
 	String_ = "String";
@@ -487,7 +487,7 @@ EndFunction
 // Keyboard - String - See GenerateKeyboardFromArray - keyboard - Keyboard JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendContact(Val Token, Val ChatID, Val Name, Val LastName, Val Phone, Val Keyboard = "") Export
 
 	String_ = "String";
@@ -522,7 +522,7 @@ EndFunction
 // Anonymous - Boolean - Poll anonymity - anonymous
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendPoll(Val Token, Val ChatID, Val Question, Val AnswersArray, Val Anonymous = True) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -557,7 +557,7 @@ EndFunction
 // ToID - String, Number - Target chat ID or ChatID*TopicID - to
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ForwardMessage(Val Token, Val OriginalID, Val FromID, Val ToID) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -628,7 +628,7 @@ EndFunction
 // UserID - String, Number - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function Ban(Val Token, Val ChatID, Val UserID) Export
 
 	String_ = "String";
@@ -656,7 +656,7 @@ EndFunction
 // UserID - String, Number - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function Unban(Val Token, Val ChatID, Val UserID) Export
 
 	String_ = "String";
@@ -687,7 +687,7 @@ EndFunction
 // UserLimit - Number - User limit (infinite if not specified) - limit
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CreateInvitationLink(Val Token
     , Val ChatID
     , Val Title = ""
@@ -721,7 +721,7 @@ EndFunction
 // MessageID - String, Number - Target message ID - message
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function PinMessage(Val Token, Val ChatID, Val MessageID) Export
     
     String_ = "String";
@@ -750,7 +750,7 @@ EndFunction
 // MessageID - String, Number - Target message ID - message
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function UnpinMessage(Val Token, Val ChatID, Val MessageID) Export
     
     String_ = "String";
@@ -777,7 +777,7 @@ EndFunction
 // ChatID - String, Number - Target chat ID - chat
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetParticipantCount(Val Token, Val ChatID) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -805,7 +805,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Key > ID, Value > Emoji
+// Map Of KeyAndValue - Key > ID, Value > Emoji
 Function GetAvatarIconList(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -839,7 +839,7 @@ EndFunction
 // IconID - String - See GetAvatarIconList - icon
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CreateForumThread(Val Token, Val ChatID, Val Title, Val IconID = "") Export
     Return ForumTopicManagement(Token, ChatID, Title, IconID);
 EndFunction
@@ -855,7 +855,7 @@ EndFunction
 // IconID - String - See GetAvatarIconList - icon
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function EditForumTopic(Val Token
     , Val ChatID
     , Val ThreadID
@@ -874,7 +874,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CloseForumThread(Val Token, Val ChatID, Val ThreadID = "") Export
     Return ManageForumThreadState(Token, ChatID, 2, ThreadID);    
 EndFunction
@@ -888,7 +888,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function OpenForumThread(Val Token, Val ChatID, Val ThreadID = "") Export
     Return ManageForumThreadState(Token, ChatID, 1, ThreadID);    
 EndFunction
@@ -902,7 +902,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DeleteForumTopic(Val Token, Val ChatID, Val ThreadID) Export
     Return ManageForumThreadState(Token, ChatID, 3, ThreadID);    
 EndFunction
@@ -915,7 +915,7 @@ EndFunction
 // ChatID - String, Number - Thread chat ID - forum
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function HideMainForumTopic(Val Token, Val ChatID) Export
     Return ManageMainTopicVisibility(Token, ChatID, True);
 EndFunction
@@ -928,7 +928,7 @@ EndFunction
 // ChatID - String, Number - Thread chat ID - forum
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ShowMainForumTopic(Val Token, Val ChatID) Export
     Return ManageMainTopicVisibility(Token, ChatID, False);
 EndFunction
@@ -942,7 +942,7 @@ EndFunction
 // Title - String - New main thread name - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function EditMainForumTopicName(Val Token, Val ChatID, Val Title) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -968,7 +968,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID. Main if not filled - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ClearThreadPinnedMessagesList(Val Token, Val ChatID, Val ThreadID = "") Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OInt/core/Modules/OPI_Twitter.os b/src/en/OInt/core/Modules/OPI_Twitter.os
index eec9c69f2d..620205527f 100644
--- a/src/en/OInt/core/Modules/OPI_Twitter.os
+++ b/src/en/OInt/core/Modules/OPI_Twitter.os
@@ -83,7 +83,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function GetToken(Val Code, Val Parameters = "") Export
 
     OPI_TypeConversion.GetLine(Code);
@@ -111,7 +111,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function RefreshToken(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -169,7 +169,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateCustomTweet(Val Text = ""
     , Val MediaArray = ""
     , Val PollOptionsArray = ""
@@ -230,7 +230,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateTextTweet(Val Text, Val Parameters = "") Export
     Return CreateCustomTweet(Text, , , , Parameters);    
 EndFunction
@@ -244,7 +244,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateImageTweet(Val Text, Val ImageArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(ImageArray, "photo", Parameters);
@@ -261,7 +261,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateGifTweet(Val Text, Val GifsArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(GifsArray, "animated_gif", Parameters);
@@ -278,7 +278,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateVideoTweet(Val Text, Val VideosArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(VideosArray, "video", Parameters);
@@ -296,7 +296,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreatePollTweet(Val Text, Val OptionArray, Val Duration, Val Parameters = "") Export
     Return CreateCustomTweet(Text, , OptionArray, Duration, Parameters);    
 EndFunction
@@ -492,7 +492,7 @@ Function GetStandardParameters(Val Parameters = "")
     // The world gigacorporation of Elon Musk, by the way, a reminder ;)
     
     // P.S The "Twitter Developer settings page" is often mentioned further" - this 
-    // https://developer.twitter.com/en/portal/dashboard и inыбор toонtoретного проеtoта from withпиwithtoа (зtoчеto c toлючем)
+    // https://developer.twitter.com/en/portal/dashboard and inыбор toонtoретного проеtoта from withпandwithtoа (зtoчеto c toлючем)
     
     Parameters_ = New Map; 
     Permissions = "tweet.read tweet.write tweet.moderate.write users.read "
@@ -512,7 +512,7 @@ Function GetStandardParameters(Val Parameters = "")
     // For the next update, you need to use a new refresh_token, so hardcode 
     // won't work (access_token won't work either) 
     
-    // |--> RefreshToken() ->|access_token --> Andwithпользуетwithя in т-нии 2-х чаwithоin for запроwithоin
+    // |--> RefreshToken() ->|access_token --> Andwithпользуетwithя in т-нandand 2-х чаwithin for запроwithin
     // | |refresh_token --|
     // |--------[after 2 hrs.]-------------------|
      
diff --git a/src/en/OInt/core/Modules/OPI_VK.os b/src/en/OInt/core/Modules/OPI_VK.os
index 47b8d621bf..0fb68d216b 100644
--- a/src/en/OInt/core/Modules/OPI_VK.os
+++ b/src/en/OInt/core/Modules/OPI_VK.os
@@ -83,7 +83,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreatePost(Val Text
     , Val ImageArray
     , Val Advertisement = False
@@ -98,13 +98,13 @@ Function CreatePost(Val Text
     For Each PostImage In ImageArray Do
         
         Parameters_ = GetStandardParameters(Parameters);
-        ResponseCorrespondence = GetImageCorrespondence(PostImage, Parameters_, "Post");
+        ResponseMap = GetImageMap(PostImage, Parameters_, "Post");
         
-        OwnerId = ResponseCorrespondence.Get("owner_id");
-        ObjectId = ResponseCorrespondence.Get("id");
+        OwnerId = ResponseMap.Get("owner_id");
+        ObjectId = ResponseMap.Get("id");
         
         If Not ValueIsFilled(OwnerId) Or Not ValueIsFilled(ObjectId) Then
-        	Return ResponseCorrespondence;
+        	Return ResponseMap;
         EndIf;
         
         OwnerId = OPI_Tools.NumberToString(OwnerId);
@@ -133,7 +133,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateCompositePost(Val Text
     , Val Objects
     , Val Advertisement = False
@@ -167,7 +167,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeletePost(Val PostID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(PostID);
@@ -191,7 +191,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreatePoll(Val Question, Val AnswersArray, Val Image = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Question);
@@ -231,14 +231,14 @@ Function CreatePoll(Val Question, Val AnswersArray, Val Image = "", Val Paramete
     Parameters_.Insert("question" , Question);
     
     Poll = OPI_Tools.Get("api.vk.com/method/polls.create", Parameters_);
-    PollCorrespondence = Poll.Get(Response_);
+    PollMap = Poll.Get(Response_);
     
-    If Not ValueIsFilled(PollCorrespondence) Then
+    If Not ValueIsFilled(PollMap) Then
     	Return Poll;
     EndIf;
     
-    OwnerId = PollCorrespondence.Get("owner_id");
-    ObjectId = PollCorrespondence.Get("id");
+    OwnerId = PollMap.Get("owner_id");
+    ObjectId = PollMap.Get("id");
     
     If Not ValueIsFilled(OwnerId) Or Not ValueIsFilled(ObjectId) Then
         Return Poll;
@@ -266,7 +266,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAlbum(Val Name, Val Description = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -292,7 +292,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteAlbum(Val AlbumID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AlbumID);
@@ -315,7 +315,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateStory(Val Image, Val URL = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(URL);
@@ -340,7 +340,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function SaveImageToAlbum(Val AlbumID, Val Image, Val Description = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AlbumID);
@@ -363,7 +363,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteImage(Val ImageID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(ImageID);
@@ -388,7 +388,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function UploadVideoToServer(Val Video
     , Val Name
     , Val Description = ""
@@ -437,7 +437,7 @@ EndFunction
 // View - String - Upload type (Post, Product, Story, Poll, Other) - type
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function UploadPhotoToServer(Val Image, Val Parameters = "", Val View = "Post") Export
        
     Parameters = GetStandardParameters(Parameters);
@@ -509,7 +509,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateDiscussion(Val Name, Val FirstMessageText, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -534,7 +534,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CloseDiscussion(Val DiscussionID, Val DeleteCompletely = False, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -558,7 +558,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function OpenDiscussion(Val DiscussionID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -581,7 +581,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteInDiscussion(Val DiscussionID, Val Text, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -610,7 +610,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function LikePost(Val PostID, Val WallID = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(PostID);
@@ -643,7 +643,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function MakeRepost(Val PostID
     , Val WallID = ""
     , Val TargetWall = ""
@@ -683,7 +683,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteMessage(Val Text
     , Val UserID
     , Val Communitytoken
@@ -724,7 +724,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteComment(Val PostID, Val WallID, Val Text, Val Parameters = "") Export
 
     Parameters_ = GetStandardParameters(Parameters);
@@ -798,7 +798,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetStatistics(Val StartDate, Val EndDate, Val Parameters = "") Export
     
     OPI_TypeConversion.GetDate(StartDate);
@@ -889,7 +889,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAdvertisingCampaign(Val AccountID, Val Name, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AccountID);
@@ -938,7 +938,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAd(Val CampaignNumber
     , Val DailyLimit
     , Val CategoryNumber
@@ -999,7 +999,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function PauseAdvertisingAd(Val AccountID, Val AdID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AccountID);
@@ -1034,7 +1034,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetAdvertisingCategoryList(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -1091,13 +1091,13 @@ Function GetProductCategoryList(Val Parameters = "") Export
     	Return Response;
     EndIf;
        
-    CategoryCorrespondence = New Map;
+    CategoryMap = New Map;
     
     For Each Category In Categories Do      
-        CategoryCorrespondence.Insert(Category["id"], Category["name"]);
+        CategoryMap.Insert(Category["id"], Category["name"]);
     EndDo;
        
-    Return CategoryCorrespondence;
+    Return CategoryMap;
     
 EndFunction
 
@@ -1109,7 +1109,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Array of product matches
+// Map Of KeyAndValue - Array of product maps
 Function GetProductList(Val Selection = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Selection);
@@ -1138,7 +1138,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetProductsByID(Val Products, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(Products);
@@ -1167,12 +1167,12 @@ EndFunction
 // Adds a new product to the community's catalog
 //
 // Parameters:
-// ProductDescription - Key-Value Pair - See GetProductDescription - product - JSON description of the product or path
+// ProductDescription - Map Of KeyAndValue - See GetProductDescription - product - JSON description of the product or path
 // Selection - String - Selection ID for placing the product, if needed - sel
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function AddProduct(Val ProductDescription, Val Selection = "", Val Parameters = "") Export        
     Return ProductManagement(ProductDescription, , Selection, Parameters);    
 EndFunction
@@ -1182,12 +1182,12 @@ EndFunction
 //
 // Parameters:
 // Product - Number, String - Identifier of the product being edited - item
-// ProductDescription - Key-Value Pair - See GetProductDescription - product - JSON description of the product or path
+// ProductDescription - Map Of KeyAndValue - See GetProductDescription - product - JSON description of the product or path
 // Selection - String - Identifier of the new selection, if needed - sel 
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function EditProduct(Val Product, Val ProductDescription, Val Selection = "", Val Parameters = "") Export
     Return ProductManagement(ProductDescription, Product, Selection, Parameters);    
 EndFunction
@@ -1200,7 +1200,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteProduct(Val Product, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Product);
@@ -1223,7 +1223,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GroupProducts(Val ProductsArray, Val ExistingGroup = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(ExistingGroup);
@@ -1253,7 +1253,7 @@ EndFunction
 // Get product description. !NOCLI
 // 
 // Returns:
-// Key-Value Pair - Empty product description:
+// Map Of KeyAndValue - Empty product description:
 // *Name - String - Product name
 // *Description - String - Product description
 // *Category - String - See GetProductCategoryList
@@ -1305,7 +1305,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Array of selection matches
+// Map Of KeyAndValue - Array of selection maps
 Function GetSelectionList(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -1326,7 +1326,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetSelectionsByID(Val Selections, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(Selections);
@@ -1360,7 +1360,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateProductCollection(Val Name
     , Val Image
     , Val Main = False
@@ -1383,7 +1383,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function EditProductCollection(Val Name
     , Val Selection
     , Val Image = ""
@@ -1404,7 +1404,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function AddProductToSelection(Val ProductsArray, Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(ProductsArray);
@@ -1437,7 +1437,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function RemoveProductFromSelection(Val Product, Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Product);
@@ -1454,7 +1454,7 @@ Function RemoveProductFromSelection(Val Product, Val Selection, Val Parameters =
     
 EndFunction
 
-// DeleteSelection
+// Delete selection
 // Deletes the selection by ID
 //
 // Parameters:
@@ -1462,7 +1462,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteSelection(Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Selection);
@@ -1487,7 +1487,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function GetPropertyList(Val Parameters = "") Export
     
     Response_ = "response";
@@ -1508,7 +1508,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function CreateProductProperty(Val Name, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -1531,7 +1531,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function EditProductProperty(Val Name, Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -1556,7 +1556,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function DeleteProductProperty(Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Property);
@@ -1579,7 +1579,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK    
+// Map Of KeyAndValue - Serialized JSON response from VK    
 Function AddProductPropertyVariant(Val Value, Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Property);
@@ -1605,7 +1605,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK      
+// Map Of KeyAndValue - Serialized JSON response from VK      
 Function EditProductPropertyVariant(Val Value, Val Property, Val Option, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Value);
@@ -1631,7 +1631,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK     
+// Map Of KeyAndValue - Serialized JSON response from VK     
 Function DeleteProductPropertyVariant(Val Option, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Option);
@@ -1656,7 +1656,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function GetOrderList(Val Parameters = "") Export
     
     Parameters = GetStandardParameters(Parameters);
@@ -1773,7 +1773,7 @@ Function GetImageID(Val Image, Val Parameters, Val View)
     
 EndFunction
 
-Function GetImageCorrespondence(Val Image, Val Parameters, Val View)
+Function GetImageMap(Val Image, Val Parameters, Val View)
 	
 	Response = UploadPhotoToServer(Image, Parameters, View);   
     ResponseArray = Response.Get("response");
@@ -1784,11 +1784,11 @@ Function GetImageCorrespondence(Val Image, Val Parameters, Val View)
     	If ResponseArray.Count() = 0 Then
     		Return Response;
     	Else
-    		ResponseCorrespondence = ResponseArray[0];
+    		ResponseMap = ResponseArray[0];
     	EndIf;
     EndIf;
      
-    Return ResponseCorrespondence;
+    Return ResponseMap;
        
 EndFunction
 
@@ -1816,7 +1816,7 @@ EndFunction
 
 Function DetermineImageUploadMethod(Val View)
     
-    MethodCorrespondence = New Map;
+    MethodMap = New Map;
     Upload = "Upload";
     Save = "Save";
     Way = "Way";
@@ -1824,40 +1824,40 @@ Function DetermineImageUploadMethod(Val View)
     
     If View = "Post" Then
        
-        MethodCorrespondence.Insert(Upload , "photos.getWallUploadServer");
-        MethodCorrespondence.Insert(Save, "photos.saveWallPhoto");
-        MethodCorrespondence.Insert(Photo , "photo");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "photos.getWallUploadServer");
+        MethodMap.Insert(Save, "photos.saveWallPhoto");
+        MethodMap.Insert(Photo , "photo");
+        MethodMap.Insert(Way , 1);
         
     ElsIf View = "Product" Then
         
-        MethodCorrespondence.Insert(Upload , "market.getProductPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "market.saveProductPhoto");
-        MethodCorrespondence.Insert(Way , 2);
+        MethodMap.Insert(Upload , "market.getProductPhotoUploadServer");
+        MethodMap.Insert(Save, "market.saveProductPhoto");
+        MethodMap.Insert(Way , 2);
         
     ElsIf View = "Story" Then
         
-        MethodCorrespondence.Insert(Upload , "stories.getPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "stories.save");
-        MethodCorrespondence.Insert(Way , 3);
+        MethodMap.Insert(Upload , "stories.getPhotoUploadServer");
+        MethodMap.Insert(Save, "stories.save");
+        MethodMap.Insert(Way , 3);
     
     ElsIf View = "Poll" Then
         
-        MethodCorrespondence.Insert(Upload , "polls.getPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "polls.savePhoto");
-        MethodCorrespondence.Insert(Photo , "photo");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "polls.getPhotoUploadServer");
+        MethodMap.Insert(Save, "polls.savePhoto");
+        MethodMap.Insert(Photo , "photo");
+        MethodMap.Insert(Way , 1);
         
     Else
         
-        MethodCorrespondence.Insert(Upload , "photos.getUploadServer");
-        MethodCorrespondence.Insert(Save, "photos.save");
-        MethodCorrespondence.Insert(Photo , "photos_list");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "photos.getUploadServer");
+        MethodMap.Insert(Save, "photos.save");
+        MethodMap.Insert(Photo , "photos_list");
+        MethodMap.Insert(Way , 1);
         
     EndIf;
     
-    Return MethodCorrespondence;
+    Return MethodMap;
     
 EndFunction
 
diff --git a/src/en/OInt/core/Modules/OPI_Viber.os b/src/en/OInt/core/Modules/OPI_Viber.os
index 03655d207b..0b7ddfbfff 100644
--- a/src/en/OInt/core/Modules/OPI_Viber.os
+++ b/src/en/OInt/core/Modules/OPI_Viber.os
@@ -51,7 +51,7 @@
 // URL - String - URL for setting up Webhook - url
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SetWebhook(Val Token, Val URL) Export
     
     Parameters = New Structure;
@@ -70,7 +70,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetChannelInformation(Val Token) Export
     
     URL = "https://chatapi.viber.com/pa/get_account_info";   
@@ -86,7 +86,7 @@ EndFunction
 // UserID - String, Number - Viber User ID - user
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetUserData(Val Token, Val UserID) Export
     
     URL = "https://chatapi.viber.com/pa/get_user_details";
@@ -108,7 +108,7 @@ EndFunction
 // UserIDs - String,Number,Array of String,Number - Viber User(s) ID - users
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetOnlineUsers(Val Token, Val UserIDs) Export
     
     URL = "https://chatapi.viber.com/pa/get_online";
@@ -137,7 +137,7 @@ EndFunction
 // Keyboard - Structure Of String - See CreateKeyboardFromArrayButton - keyboard
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendTextMessage(Val Token
     , Val Text
     , Val UserID
@@ -159,7 +159,7 @@ EndFunction
 // Description - String - Image annotation - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendImage(Val Token, Val URL, Val UserID, Val SendingToChannel, Val Description = "") Export
     
     Return SendMessage(Token, "picture", UserID, SendingToChannel, URL, Description);
@@ -178,7 +178,7 @@ EndFunction
 // Size - Number - File size. If not filled in > determined automatically by downloading the file - size
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendFile(Val Token
     , Val URL
     , Val UserID
@@ -216,7 +216,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendContact(Val Token
     , Val ContactName
     , Val PhoneNumber
@@ -242,7 +242,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendLocation(Val Token, Val Latitude, Val Longitude, Val UserID, Val SendingToChannel) Export
     
     Parameters = New Structure;
@@ -263,7 +263,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendLink(Val Token, Val URL, Val UserID, Val SendingToChannel) Export
     
     Return SendMessage(Token, "url", UserID, SendingToChannel, URL);
@@ -323,7 +323,7 @@ EndFunction
 // UserID - String, Number - Viber User ID
 // IsChannel - Boolean - Sending to channel or bot chat
 // Value - String, Structure - Value:
-// * URL - String - При отпраintoе URL
+// * URL - String - Прand отпраintoе URL
 // * Size - Number, String - File size in case of sending
 // * Extension - String - File extension in case of sending
 // Text - String - Message text
diff --git a/src/en/OInt/core/Modules/OPI_YandexDisk.os b/src/en/OInt/core/Modules/OPI_YandexDisk.os
index 4240ede1bb..26139fdae3 100644
--- a/src/en/OInt/core/Modules/OPI_YandexDisk.os
+++ b/src/en/OInt/core/Modules/OPI_YandexDisk.os
@@ -50,7 +50,7 @@
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDiskInformation(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -70,7 +70,7 @@ EndFunction
 // Path - String - Path to the created folder - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CreateFolder(Val Token, Val Path) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -106,7 +106,7 @@ EndFunction
 // Path - String - Path to folder or file - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetObject(Val Token, Val Path) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -131,7 +131,7 @@ EndFunction
 // ToCart - Boolean - To cart - can
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function DeleteObject(Val Token, Val Path, Val ToCart = True) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -160,7 +160,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CreateObjectCopy(Val Token, Val Original, Val Path, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -200,7 +200,7 @@ EndFunction
 // Path - String - Path to the file for downloading - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDownloadLink(Val Token, Val Path) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -257,7 +257,7 @@ EndFunction
 // SortByDate - Boolean - True > sort by date, False > alphabetically - datesort
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetFilesList(Val Token
     , Val Count = 0
     , Val OffsetFromStart = 0
@@ -308,7 +308,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function MoveObject(Val Token, Val Original, Val Path, Val Overwrite = False) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -349,7 +349,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex 
+// Map Of KeyAndValue - serialized JSON response from Yandex 
 Function UploadFile(Val Token, Val Path, Val File, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -387,7 +387,7 @@ EndFunction
 // Address - String - File URL - url
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function UploadFileByURL(Val Token, Val Path, Val Address) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -420,7 +420,7 @@ EndFunction
 // Path - String - Path to the object to be published - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex 
+// Map Of KeyAndValue - serialized JSON response from Yandex 
 Function PublishObject(Val Token, Val Path) Export
     Return TogglePublicAccess(Token, Path, True);   
 EndFunction
@@ -433,7 +433,7 @@ EndFunction
 // Path - String - Path to the previously published object - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CancelObjectPublication(Val Token, Val Path) Export
     Return TogglePublicAccess(Token, Path, False);
 EndFunction
@@ -447,7 +447,7 @@ EndFunction
 // OffsetFromStart - Number - Offset for getting objects not from the beginning of the list - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetPublishedObjectsList(Val Token, Val Count = 0, Val OffsetFromStart = 0) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -482,7 +482,7 @@ EndFunction
 // OffsetFromStart - Number - Offset for getting nested objects not from the beginning of the list - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetPublicObject(Val Token, Val URL, Val Count = 0, Val OffsetFromStart = 0) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -519,7 +519,7 @@ EndFunction
 // Path - String - Path inside the object - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDownloadLinkForPublicObject(Val Token, Val URL, Val Path = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -552,7 +552,7 @@ EndFunction
 // Target - String - File save path - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function SavePublicObjectToDisk(Val Token, Val URL, From = "", Target = "") Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OInt/core/Modules/OPI_YandexID.os b/src/en/OInt/core/Modules/OPI_YandexID.os
index ef3cac962c..0154c209e2 100644
--- a/src/en/OInt/core/Modules/OPI_YandexID.os
+++ b/src/en/OInt/core/Modules/OPI_YandexID.os
@@ -45,7 +45,7 @@
 // ClientId - String - Client id - id
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetConfirmationCode(Val ClientId) Export
 
     OPI_TypeConversion.GetLine(ClientId);
@@ -66,7 +66,7 @@ EndFunction
 // DeviceCode - String - device_code from GetConfirmationCode() - device
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function ConvertCodeToToken(Val ClientId, Val ClientSecret, Val DeviceCode) Export
     
     OPI_TypeConversion.GetLine(ClientId);
@@ -94,7 +94,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function RefreshToken(Val ClientId, Val ClientSecret, Val RefreshToken) Export
     
     OPI_TypeConversion.GetLine(ClientId);
diff --git a/src/en/OInt/tests/Modules/internal/OPI_Tests.os b/src/en/OInt/tests/Modules/internal/OPI_Tests.os
index 5fcd96918b..460d7dcbe3 100644
--- a/src/en/OInt/tests/Modules/internal/OPI_Tests.os
+++ b/src/en/OInt/tests/Modules/internal/OPI_Tests.os
@@ -413,7 +413,7 @@ Procedure VKAPI_LikeRepostComment() Export
     Parameters = GetVKParameters();
     Text = "Post from autotest";
     Message = "Message from autotest";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     
@@ -426,7 +426,7 @@ Procedure VKAPI_LikeRepostComment() Export
     
     OPI_Tools.Pause(5);
       
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["likes"]).ИмеетТип(TypeNumber).Заполнено();
         
     ExternalPost = 2571;
@@ -438,7 +438,7 @@ Procedure VKAPI_LikeRepostComment() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["success"]).ИмеетТип(TypeNumber).Равно(1);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["wall_repost_count"]).ИмеетТип(TypeNumber).Равно(1); 
         
@@ -448,7 +448,7 @@ Procedure VKAPI_LikeRepostComment() Export
         
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["comment_id"]).ИмеетТип(TypeNumber).Заполнено();
    
     OPI_VK.DeletePost(PostID, Parameters);
@@ -464,15 +464,15 @@ Procedure VKAPI_GetStatistics() Export
     Parameters = GetVKParameters();
     Date0 = BegOfDay(CurrentDate);
     Date1 = EndOfDay(Date0);
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
      
     Result = OPI_VK.GetStatistics(Date0, Date1, Parameters);
     
     OPI_TestDataRetrieval.WriteLog(Result, "GetStatistics");
         
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
-    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["visitors"]).ИмеетТип(TypeMatch).Заполнено();
-    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["reach"]).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["visitors"]).ИмеетТип(TypeMap).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["reach"]).ИмеетТип(TypeMap).Заполнено();
     
     OPI_Tools.Pause(5);
 
@@ -501,7 +501,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     Parameters = GetVKParameters();
     CabinetID = OPI_TestDataRetrieval.GetParameter("VK_AdsCabinetID");
     Name = "Test ads";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     UID_ = "id";
@@ -512,7 +512,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result["error_code"]).ИмеетТип(TypeNumber).Равно(602);
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
         
@@ -534,7 +534,7 @@ Procedure VKAPI_CreateAdCampaign() Export
             
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result["error_code"]).ИмеетТип(TypeNumber).Равно(602);
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
         
@@ -545,7 +545,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
  
     OPI_VK.DeletePost(PostID, Parameters);
@@ -595,7 +595,7 @@ EndProcedure
 Procedure VKAPI_CreateProductSelection() Export
  
     Parameters = GetVKParameters();
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     Image = OPI_TestDataRetrieval.GetBinary("Picture");
@@ -612,7 +612,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["albums_count"]).ИмеетТип(TypeNumber).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["market_album_id"]).ИмеетТип(TypeNumber).Заполнено();
              
@@ -624,7 +624,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]).ИмеетТип(TypeNumber).Равно(1);
  
     ImageArray = New Array;
@@ -652,7 +652,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_TestDataRetrieval.WriteLog(Result, "AddProduct");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["market_item_id"]).ИмеетТип(TypeNumber).Заполнено();
         
     ProductID = Result[Response_]["market_item_id"];
@@ -672,7 +672,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]).ИмеетТип(TypeNumber).Заполнено();
         
     Result = OPI_VK.RemoveProductFromSelection(ProductID, SelectionID, Parameters); // Deletes from selections
@@ -705,7 +705,7 @@ EndProcedure
 Procedure VKAPI_CreateProductWithProperties() Export
  
     Parameters = GetVKParameters();
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     MII_ = "market_item_id";
     Response_ = "response";
@@ -729,9 +729,9 @@ Procedure VKAPI_CreateProductWithProperties() Export
     Property = Result[Response_]["property_id"];
     Property = OPI_Tools.NumberToString(Property);
      
-    PropertyMatch = New Map;
+    PropertyMap = New Map;
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["property_id"]).ИмеетТип(TypeNumber).Заполнено();
         
     Result = OPI_VK.EditProductProperty("Color (change.)", Property, Parameters);
@@ -750,11 +750,11 @@ Procedure VKAPI_CreateProductWithProperties() Export
         
         OPI_Tools.Pause(5);
         
-        OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+        OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
         OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["variant_id"]).ИмеетТип(TypeNumber).Заполнено();
             
         VariantID = Result[Response_]["variant_id"];
-        PropertyMatch.Insert(Option, VariantID);
+        PropertyMap.Insert(Option, VariantID);
         
         Result = OPI_VK.EditProductPropertyVariant(Option + String(New UUID())
             , Property
@@ -788,7 +788,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     Product.Insert("Weight" , 100);
     Product.Insert("SKU" , 12345);
     Product.Insert("AvailableBalance" , "10");
-    Product.Insert("PropertyValues" , PropertyMatch[Yellow_]);
+    Product.Insert("PropertyValues" , PropertyMap[Yellow_]);
     
     Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product  
     
@@ -798,11 +798,11 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     YellowID = Result[Response_]["market_item_id"];               
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено();
         
     Product.Insert("Name" , "TestProduct (" + Red_ + ")");
-    Product.Insert("PropertyValues", PropertyMatch[Red_]);
+    Product.Insert("PropertyValues", PropertyMap[Red_]);
 
     Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product
     
@@ -812,7 +812,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     RedID = Result[Response_][MII_];               
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено();
         
     ProductsArray = New Array;
@@ -825,7 +825,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["items"]).ИмеетТип("Array").ИмеетДлину(2);
         
     Result = OPI_VK.GroupProducts(ProductsArray, , Parameters);
@@ -834,13 +834,13 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["item_group_id"]).ИмеетТип(TypeNumber).Заполнено();
        
     OPI_VK.DeleteProduct(YellowID , Parameters);
     OPI_VK.DeleteProduct(RedID, Parameters);
     
-    For Each Option In PropertyMatch Do
+    For Each Option In PropertyMap Do
         
         Deletion = OPI_VK.DeleteProductPropertyVariant(Option.Value, Parameters);
         
@@ -1564,7 +1564,7 @@ Procedure GC_CreateDeleteCalendar() Export
     Name = "TestCalendar";
     Description = "TestDescription";
     EditedName = Name + " (change.)";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeString = Type("String");
     Summary = "summary";
     Black = "#000000";
@@ -1574,7 +1574,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     OPI_TestDataRetrieval.WriteLog(Result, "CreateCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(Name);
     OPI_TestDataRetrieval.ExpectsThat(Result["id"]).ИмеетТип(TypeString).Заполнено();
         
@@ -1605,7 +1605,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     OPI_TestDataRetrieval.WriteLog(Result, "EditListCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(EditedName);
     OPI_TestDataRetrieval.ExpectsThat(Result["foregroundColor"]).Равно(Black);
     OPI_TestDataRetrieval.ExpectsThat(Result["backgroundColor"]).Равно(Yellow);
@@ -1614,7 +1614,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     OPI_TestDataRetrieval.WriteLog(Result, "GetListCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(EditedName);
     OPI_TestDataRetrieval.ExpectsThat(Result["foregroundColor"]).Равно(Black);
     OPI_TestDataRetrieval.ExpectsThat(Result["backgroundColor"]).Равно(Yellow);
@@ -1659,16 +1659,16 @@ Procedure GC_CreateDeleteEvent() Export
     Attachments.Insert("Image2"
         , "https://github.com/Bayselonarrend/OpenIntegrations/raw/main/Media/logo.png?v1");
     
-    EventMatch = New Map;
-    EventMatch.Insert("Description" , Description);
-    EventMatch.Insert("Title" , Name);
-    EventMatch.Insert("Venue" , "InOffice");
-    EventMatch.Insert("StartDate" , CurrentDate);
-    EventMatch.Insert("EndDate" , EventMatch["StartDate"] + Hour);
-    EventMatch.Insert("ArrayOfAttachmentURLs" , Attachments);
-    EventMatch.Insert("SendNotifications" , True);
+    EventMap = New Map;
+    EventMap.Insert("Description" , Description);
+    EventMap.Insert("Title" , Name);
+    EventMap.Insert("Venue" , "InOffice");
+    EventMap.Insert("StartDate" , CurrentDate);
+    EventMap.Insert("EndDate" , EventMap["StartDate"] + Hour);
+    EventMap.Insert("ArrayOfAttachmentURLs" , Attachments);
+    EventMap.Insert("SendNotifications" , True);
     
-    Result = OPI_GoogleCalendar.CreateEvent(Token, Calendar, EventMatch);
+    Result = OPI_GoogleCalendar.CreateEvent(Token, Calendar, EventMap);
     
     OPI_TestDataRetrieval.WriteLog(Result, "CreateEvent");
     
@@ -1676,10 +1676,10 @@ Procedure GC_CreateDeleteEvent() Export
     
     Check_GKObject(Result, Name, Description);
       
-    EventMatch = New Map;  
-    EventMatch.Insert("Description", EditedDescription);
+    EventMap = New Map;  
+    EventMap.Insert("Description", EditedDescription);
     
-    Result = OPI_GoogleCalendar.EditEvent(Token, Calendar, EventMatch, Event);
+    Result = OPI_GoogleCalendar.EditEvent(Token, Calendar, EventMap, Event);
     
     OPI_TestDataRetrieval.WriteLog(Result, "EditEvent");
     
diff --git a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
index 88bf6ed761..1666d946ce 100644
--- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
+++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
@@ -334,7 +334,7 @@ Function ReadJSONFile(Val Path) Export
     
 EndFunction
 
-Function RequestParametersToMatch(Val ParameterString) Export
+Function RequestParametersToMap(Val ParameterString) Export
 
     ReturnMapping = New Map;
     NumberOfParts = 2;
diff --git a/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl
index 3b17bc1ba0..946440d9a5 100644
--- a/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Airtable/Module.bsl
@@ -47,7 +47,7 @@
 // Indent - String - Next page identifier of the base list from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable 
+// Map Of KeyAndValue - serialized JSON response from Airtable 
 Function GetListOfBases(Val Token, Val Indent = "") Export
     
     OPI_TypeConversion.GetLine(Indent);
@@ -72,7 +72,7 @@ EndFunction
 // Base - String - Base identifier - base
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetDatabaseTables(Val Token, Val Base) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -93,10 +93,10 @@ EndFunction
 // Token - String - Token - token
 // Workspace - String - Workspace identifier - ws
 // Name - String - New base name - title
-// TableCollection - Key-Value Pair - Table description: Key > name, Value > array of fields - tablesdata
+// TableCollection - Map Of KeyAndValue - Table description: Key > name, Value > array of fields - tablesdata
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateDatabase(Val Token, Val Workspace, Val Name, Val TableCollection) Export
     
     OPI_TypeConversion.GetCollection(TableCollection);
@@ -145,7 +145,7 @@ EndFunction
 // Description - String - Table description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateTable(Val Token, Val Base, Val Name, Val FieldArray, Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -171,7 +171,7 @@ EndFunction
 // Description - String - New description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function ModifyTable(Val Token, Val Base, Val Table, Val Name = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -204,7 +204,7 @@ EndFunction
 // FieldStructure - Structure of Key-Value - Description of the new field - fielddata
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateField(Val Token, Val Base, Val Table, Val FieldStructure) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -239,7 +239,7 @@ EndFunction
 // Description - String - New description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function ModifyField(Val Token, Val Base, Val Table, Val Field, Val Name = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -389,7 +389,7 @@ EndFunction
 // Indent - String - Next page identifier of data from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetListOfRecords(Val Token, Val Base, Val Table, Val Indent = "") Export
 
     OPI_TypeConversion.GetLine(Base);
@@ -417,7 +417,7 @@ EndFunction
 // Record - String - Record identifier in the table - record
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetRecord(Val Token, Val Base, Val Table, Val Record) Export
    
     OPI_TypeConversion.GetLine(Base);
@@ -443,7 +443,7 @@ EndFunction
 // Data - Structure, Array of Structure - Set or array of sets of Key : Value pairs > Field : Indicator - data
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreatePosts(Val Token, Val Base, Val Table, Val Data) Export
 
     OPI_TypeConversion.GetLine(Base);
@@ -472,7 +472,7 @@ EndFunction
 // Records - String, Array of String - Identifier or array of record identifiers - records
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function DeletePosts(Val Token, Val Base, Val Table, Val Records) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -512,7 +512,7 @@ EndFunction
 // Indent - String - Next page identifier of data from the previous request - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function GetComments(Val Token, Val Base, Val Table, Val Record, Val Indent = "") Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -542,7 +542,7 @@ EndFunction
 // Text - String - Comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function CreateComment(Val Token, Val Base, Val Table, Val Record, Val Text) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -573,7 +573,7 @@ EndFunction
 // Text - String - New comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable
+// Map Of KeyAndValue - serialized JSON response from Airtable
 Function EditComment(Val Token, Val Base, Val Table, Val Record, Val Comment, Val Text) Export
     
     OPI_TypeConversion.GetLine(Base);
@@ -604,7 +604,7 @@ EndFunction
 // Comment - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Airtable 
+// Map Of KeyAndValue - serialized JSON response from Airtable 
 Function DeleteComment(Val Token, Val Base, Val Table, Val Record, Val Comment) Export
 
     OPI_TypeConversion.GetLine(Base);
diff --git a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl
index 210f5efe52..c3e7574aeb 100644
--- a/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Dropbox/Module.bsl
@@ -65,7 +65,7 @@ EndFunction
 // Code - String - Code from the authorization page - code
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetToken(Val AppKey, Val AppSecret, Val Code) Export
     
     URL = "https://api.dropbox.com/oauth2/token";
@@ -103,7 +103,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function RefreshToken(Val AppKey, Val AppSecret, Val RefreshToken) Export
     
     String_ = "String";
@@ -129,7 +129,7 @@ EndFunction
 // Account - String - Account ID. Current token account if not filled - account
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetAccountInformation(Val Token, Val Account = "") Export
     
     If ValueIsFilled(Account) Then
@@ -149,7 +149,7 @@ EndFunction
 // Token - String - Token - token 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetSpaceUsageData(Val Token) Export
     
     URL = "https://api.dropboxapi.com/2/users/get_space_usage";
@@ -178,7 +178,7 @@ EndFunction
 // Detailed - Boolean - Adds additional information fields for media files - detail 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox 
+// Map Of KeyAndValue - serialized JSON response from Dropbox 
 Function GetObjectInformation(Val Token, Val Path, Val Detailed = False) Export
     
     URL = "https://api.dropboxapi.com/2/files/get_metadata"; 
@@ -260,7 +260,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite file in case of path conflicts - overwrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox 
+// Map Of KeyAndValue - serialized JSON response from Dropbox 
 Function UploadFile(Val Token, Val File, Val Path, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetBinaryData(File);
@@ -290,7 +290,7 @@ EndFunction
 // Path - String - Save path on Dropbox - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function UploadFileByURL(Val Token, Val FileURL, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/files/save_url"; 
@@ -314,7 +314,7 @@ EndFunction
 // JobID - String - ID of the asynchronous job from the UploadFileByURL response - job 
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetUploadStatusByURL(Val Token, Val JobID) Export
     
     URL = "https://api.dropboxapi.com/2/files/save_url/check_job_status"; 
@@ -338,7 +338,7 @@ EndFunction
 // Irrecoverable - String - Delete object without the possibility of recovery - permanently
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function DeleteObject(Val Token, Val Path, Val Irrecoverable = False) Export
     
     OPI_TypeConversion.GetBoolean(Irrecoverable);
@@ -364,7 +364,7 @@ EndFunction
 // Target - String - Target path for the new object - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CopyObject(Val Token, Val From, Val Target) Export
    
     URL = "https://api.dropboxapi.com/2/files/copy_v2";
@@ -390,7 +390,7 @@ EndFunction
 // Target - String - Target path for the new object - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function MoveObject(Val Token, Val From, Val Target) Export
 
     URL = "https://api.dropboxapi.com/2/files/move_v2";
@@ -415,7 +415,7 @@ EndFunction
 // Path - String - Target path for creating the directory - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CreateFolder(Val Token, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/files/create_folder_v2";
@@ -470,7 +470,7 @@ EndFunction
 // Count - String, Number - Number of the latest versions of the object to display - amount
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetObjectVersionList(Val Token, Val Path, Val Count = 10) Export
     
     URL = "https://api.dropboxapi.com/2/files/list_revisions"; 
@@ -495,7 +495,7 @@ EndFunction
 // Version - String - ID of the version (revision) for restoration - rev
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function RestoreObjectToVersion(Val Token, Val Path, Val Version) Export
     
     URL = "https://api.dropboxapi.com/2/files/restore"; 
@@ -523,7 +523,7 @@ EndFunction
 // Paths - String, Array of String - Path or set of paths to the files - paths
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetTagList(Val Token, Val Paths) Export
     
     URL = "https://api.dropboxapi.com/2/files/tags/get";
@@ -548,7 +548,7 @@ EndFunction
 // Tag - String - Tag text - tag
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function AddTag(Val Token, Val Path, Val Tag) Export
     
     Return ProcessTag(Token, Path, Tag);
@@ -564,7 +564,7 @@ EndFunction
 // Tag - String - Tag text - tag
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function DeleteTag(Val Token, Val Path, Val Tag) Export
     
     Return ProcessTag(Token, Path, Tag, True);
@@ -583,7 +583,7 @@ EndFunction
 // Path - String - Path to the target directory - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function PublishFolder(Val Token, Val Path) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/share_folder";
@@ -601,7 +601,7 @@ EndFunction
 // FolderID - String - ID of the public catalog (shared folder ID) - folder
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CancelFolderPublication(Val Token, Val FolderID) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/unshare_folder";
@@ -626,7 +626,7 @@ EndFunction
 // ViewOnly - Boolean - Prohibits file editing for the external user - readonly
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function AddUsersToFile(Val Token, Val FileID, Val EmailAddresses, Val ViewOnly = True) Export
     
     String_ = "String";
@@ -724,7 +724,7 @@ EndFunction
 // JobID - String - AsynchronousJobID - job
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function GetAsynchronousChangeStatus(Val Token, Val JobID) Export
     
     URL = "https://api.dropboxapi.com/2/sharing/check_job_status";
@@ -747,7 +747,7 @@ EndFunction
 // FileID - String - ID of the file to be accessed - fileid
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Dropbox
+// Map Of KeyAndValue - serialized JSON response from Dropbox
 Function CancelFilePublication(Val Token, Val FileID) Export
 	
 	OPI_TypeConversion.GetLine(FileID);
diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl
index 07250fb6da..4a718e7c43 100644
--- a/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_GoogleCalendar/Module.bsl
@@ -48,7 +48,7 @@
 // Name - String - Name of the created calendar - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateCalendar(Val Token, Val Name) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -75,7 +75,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCalendarMetadata(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -99,7 +99,7 @@ EndFunction
 // Description - String - New calendar description - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditCalendarMetadata(Val Token
     , Val Calendar
     , Val Name = ""
@@ -136,7 +136,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function ClearMainCalendar(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -157,7 +157,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteCalendar(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -182,7 +182,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Array of calendar data mappings
+// Map Of KeyAndValue - Array of calendar data mappings
 Function GetCalendarList(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -204,7 +204,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function AddCalendarToList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -230,7 +230,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetListCalendar(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -252,7 +252,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteCalendarFromList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -277,7 +277,7 @@ EndFunction
 // Hidden - Boolean - Hidden calendar - hidden
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditListCalendar(Val Token
     , Val Calendar
     , Val PrimaryColor
@@ -311,7 +311,7 @@ EndFunction
 // Get event description !NOCLI
 // 
 // Returns:
-// Key-Value Pair - Empty event template
+// Map Of KeyAndValue - Empty event template
 Function GetEventDescription() Export
     
     CurrentDate = OPI_Tools.GetCurrentDate();
@@ -338,7 +338,7 @@ EndFunction
 // Calendar - String - Calendar ID - calendar
 // 
 // Returns:
-// Key-Value Pair - Array of event mappings
+// Map Of KeyAndValue - Array of event maps
 Function GetEventList(Val Token, Val Calendar) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -362,7 +362,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetEvent(Val Token, Val Calendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -387,7 +387,7 @@ EndFunction
 // Parameters:
 // Token - String - Token - token         
 // Calendar - String - Calendar ID - calendar
-// EventDescription - Key-Value Pair - Event description - props
+// EventDescription - Map Of KeyAndValue - Event description - props
 // 
 // Returns:
 // String, Arbitrary, HTTPResponse, BinaryData, Undefined - Google server response
@@ -405,7 +405,7 @@ EndFunction
 // Event - String - ID of the source calendar event - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function MoveEvent(Val Token, Val SourceCalendar, Val TargetCalendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -437,7 +437,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditEvent(Val Token, Val Calendar, Val EventDescription, Val Event) Export
     Return EventManagement(Token, Calendar, EventDescription, Event);
 EndFunction
@@ -451,7 +451,7 @@ EndFunction
 // Event - String - Event ID - event
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteEvent(Val Token, Val Calendar, Val Event) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl
index 03f6e38d10..7e8d79203d 100644
--- a/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_GoogleDrive/Module.bsl
@@ -48,7 +48,7 @@
 // Identifier - String - Identifier of the file or folder - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetObjectInformation(Val Token, Val Identifier) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -75,7 +75,7 @@ EndFunction
 // Detailed - Boolean - Adds a list of files to the directory fields - depth
 // 
 // Returns:
-// Key-Value Pair - Array of directory mappings
+// Map Of KeyAndValue - Array of directory mappings
 Function GetDirectoriesList(Val Token, Val NameContains = "", Val Detailed = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -111,7 +111,7 @@ EndFunction
 // Directory - String - Filter by parent directory ID - catalog
 // 
 // Returns:
-// Key-Value Pair - Array of file mappings
+// Map Of KeyAndValue - Array of file mappings
 Function GetFilesList(Val Token, Val NameContains = "", Val Directory = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -144,10 +144,10 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // File - BinaryData,String - File to be uploaded - file
-// Description - Key-Value Pair - See GetFileDescription - props - JSON description or path to .json
+// Description - Map Of KeyAndValue - See GetFileDescription - props - JSON description or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function UploadFile(Val Token, Val File, Val Description) Export
     Return FileManagement(Token, File, Description);   
 EndFunction
@@ -161,7 +161,7 @@ EndFunction
 // Parent - String - Parent - catalog
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateFolder(Val Token, Val Name, Val Parent = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -215,7 +215,7 @@ EndFunction
 // NewParent - String - New parent directory - catalog
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CopyObject(Val Token, Val Identifier, Val NewName = "", Val NewParent = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -256,7 +256,7 @@ EndFunction
 // NewName - String - New file name (if necessary) - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function UpdateFile(Val Token, Val Identifier, Val File, Val NewName = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -283,7 +283,7 @@ EndFunction
 // Identifier - String - Identifier of the object to delete - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteObject(Val Token, Val Identifier) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -300,7 +300,7 @@ EndFunction
 // Get file description !NOCLI
 // 
 // Returns:
-// Key-Value Pair - File description
+// Map Of KeyAndValue - File description
 Function GetFileDescription() Export
     
     Description = New Map;
@@ -326,7 +326,7 @@ EndFunction
 // Comment - String - Comment text - text
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateComment(Val Token, Val Identifier, Val Comment) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -354,7 +354,7 @@ EndFunction
 // CommentID - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetComment(Val Token, Val ObjectID, Val CommentID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -381,7 +381,7 @@ EndFunction
 // ObjectID - String - Object identifier - object
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCommentList(Val Token, Val ObjectID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -408,7 +408,7 @@ EndFunction
 // CommentID - String - Comment identifier - comment
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteComment(Val Token, Val ObjectID, Val CommentID) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl
index 6f550eb73e..c3ffd16d52 100644
--- a/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_GoogleSheets/Module.bsl
@@ -49,7 +49,7 @@
 // ArrayOfSheetNames - Array of String - Array of names to add new sheets to the book - sheets
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CreateBook(Val Token, Val Name, Val ArrayOfSheetNames) Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -81,7 +81,7 @@ EndFunction
 // Identifier - String - BookIdentifier - spreadsheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetBook(Val Token, Val Identifier) Export
 
     OPI_TypeConversion.GetLine(Identifier); 
@@ -104,7 +104,7 @@ EndFunction
 // Name - String - New name - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function EditBookTitle(Val Token, Val Book, Val Name) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -142,7 +142,7 @@ EndFunction
 // Name - String - NewSheetName - title
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function AddSheet(Val Token, Val Book, Val Name) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -172,7 +172,7 @@ EndFunction
 // Sheet - String - IdentifierOfSheetToDelete - sheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function DeleteSheet(Val Token, Val Book, Val Sheet) Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -204,7 +204,7 @@ EndFunction
 // Sheet - String - CopiedSheetID - sheet
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function CopySheet(Val Token, Val From, Val Target, Val Sheet) Export
     
     OPI_TypeConversion.GetLine(From);
@@ -235,12 +235,12 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // Book - String - BookID - spreadsheet 
-// ValueMapping - Key-Value Pair - Fill data where the key is the cell name like A1 - data
+// ValueMapping - Map Of KeyAndValue - Fill data where the key is the cell name like A1 - data
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // MajorDimension - String - Main dimension when filling the array range - dim
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function SetCellValues(Val Token
     , Val Book
     , Val ValueMapping
@@ -276,7 +276,7 @@ EndFunction
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function ClearCells(Val Token, Val Book, Val CellsArray, Val Sheet = "") Export
     
     OPI_TypeConversion.GetLine(Book);
@@ -304,7 +304,7 @@ EndFunction
 // Sheet - String - Sheet name (first sheet by default) - sheetname
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetCellValues(Val Token, Val Book, Val CellsArray = "", Val Sheet = "") Export
     
     OPI_TypeConversion.GetLine(Book);
diff --git a/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl b/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl
index deef998414..7b4238254b 100644
--- a/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_GoogleWorkspace/Module.bsl
@@ -83,7 +83,7 @@ EndFunction
 // Code - String - Code from browser - code
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function GetTokenByCode(Val ClientID, Val ClientSecret, Val Code) Export
     
     OPI_TypeConversion.GetLine(ClientID);
@@ -114,7 +114,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Google
+// Map Of KeyAndValue - serialized JSON response from Google
 Function RefreshToken(Val ClientID, Val ClientSecret, Val RefreshToken) Export
     
     OPI_TypeConversion.GetLine(ClientID);
diff --git a/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl
index 638a3a8dc0..af1f03b0ba 100644
--- a/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Notion/Module.bsl
@@ -52,7 +52,7 @@
 // Title - String - Page title - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreatePage(Val Token, Val Parent, Val Title) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -80,10 +80,10 @@ EndFunction
 // Parameters:
 // Token - String - Token - token 
 // Parent - String - Parent database ID - base
-// Data - Key-Value Pair - Properties match - data
+// Data - Map Of KeyAndValue - Properties map - data
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreatePageInDatabase(Val Token, Val Parent, Val Data) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -112,7 +112,7 @@ EndFunction
 // Page - String - Page ID - page 
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetPage(Val Token, Val Page) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -132,13 +132,13 @@ EndFunction
 // Parameters:
 // Token - String - Token - token
 // Page - String - ID of the page being modified - page
-// Data - Key-Value Pair - Matching of editable parameters - data
+// Data - Map Of KeyAndValue - Map of editable parameters - data
 // Icon - String - URL of the page icon image - icon
 // Cover - String - URL of the page cover image - cover
 // Archived - Boolean - Archive page or not (boolean) - archive
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function EditPageProperties(Val Token
     , Val Page
     , Val Data = ""
@@ -211,7 +211,7 @@ EndFunction
 // Properties - Structure Of String - Database properties - props
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreateDatabase(Val Token, Val Parent, Val Title, Val Properties = "") Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -227,9 +227,9 @@ Function CreateDatabase(Val Token, Val Parent, Val Title, Val Properties = "") E
     // Count    : number
     // Date : date
     // Status : Map
-    // Аtoтиinный : green
+    // Аtoтandinный : green
     // Inactive    : red
-    // Архиin : yellow
+    // Архandin : yellow
     
     // All pages created as children must have parent base properties
 
@@ -258,7 +258,7 @@ EndFunction
 // Base - String - Database ID - base
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetDatabase(Val Token, Val Base) Export
    
     OPI_TypeConversion.GetLine(Token);
@@ -284,7 +284,7 @@ EndFunction
 // Description - String - New database description - description
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function EditDatabaseProperties(Val Token, Val Base, Val Properties = "", Val Title = "", Val Description = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -329,7 +329,7 @@ EndFunction
 // InsertAfter - String - Block ID after which to insert the new one - prev
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function CreateBlock(Val Token, Val Parent, Val Block, Val InsertAfter = "") Export
   
     OPI_TypeConversion.GetLine(Token);
@@ -374,7 +374,7 @@ EndFunction
 // OnlyBase - Boolean - True > service fields are deleted, only the block itself remains - core
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function ReturnBlock(Val Token, Val BlockID, Val OnlyBase = True) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -402,7 +402,7 @@ EndFunction
 // BlockID - String - Parent block ID - block
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function ReturnChildBlocks(Val Token, Val BlockID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -425,7 +425,7 @@ EndFunction
 // BlockID - String - Block ID - block
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function DeleteBlock(Val Token, Val BlockID) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -451,7 +451,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function UserList(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -471,7 +471,7 @@ EndFunction
 // UserID - String - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Notion
+// Map Of KeyAndValue - Serialized JSON response from Notion
 Function GetUserData(Val Token, Val UserID) Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl
index 54fd26a2d1..3951feb47f 100644
--- a/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Slack/Module.bsl
@@ -47,7 +47,7 @@
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack 
+// Map Of KeyAndValue - Serialized JSON response from Slack 
 Function GetBotInformation(Val Token) Export
     
     URL = "https://slack.com/api/auth.test";
@@ -67,7 +67,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetWorkspaceList(Val Token, Val Cursor = "") Export
     
     URL = "https://slack.com/api/auth.teams.list";
@@ -85,7 +85,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetUserList(Val Token, Val Cursor = "") Export
     
     URL = "https://slack.com/api/users.list";
@@ -110,7 +110,7 @@ EndFunction
 // Blocks - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendMessage(Val Token, Val Channel, Val Text = "", Val SendingDate = "", Val Blocks = "") Export
       
     String_ = "String";
@@ -164,7 +164,7 @@ EndFunction
 // Blocks - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendEphemeralMessage(Val Token
     , Val Channel
     , Val Text = ""
@@ -204,7 +204,7 @@ EndFunction
 // BlockArray - Array of Structure - Array of block descriptions - blocks - JSON array of block descriptions
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function EditMessage(Val Token, Val Channel, Val Timestamp, Val Text = "", Val BlockArray = "") Export
     
     String_ = "String";
@@ -233,7 +233,7 @@ EndFunction
 // IsDelayed - Boolean - Indicator of deleting a delayed message - issheduled
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteMessage(Val Token, Val Channel, Val Timestamp, Val IsDelayed = False) Export
     
     OPI_TypeConversion.GetBoolean(IsDelayed);
@@ -267,7 +267,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetDelayedMessageList(Val Token, Val Channel, Val Cursor = "") Export
     
     URL = "https://slack.com/api/chat.scheduledMessages.list";
@@ -292,7 +292,7 @@ EndFunction
 // Timestamp - String - Timestamp or message ID - stamp
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetMessageLink(Val Token, Val Channel, Val Timestamp) Export
     
     URL = "https://slack.com/api/chat.getPermalink";
@@ -318,7 +318,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetMessageReplyList(Val Token, Val Channel, Val Timestamp, Val Cursor = "") Export
     
     String_ = "String";
@@ -349,7 +349,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelList(Val Token, Val ExcludeArchived = False, Val Cursor = "") Export
     
     URL = "https://slack.com/api/conversations.list";
@@ -374,7 +374,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelUserList(Val Token, Val Channel, Val Cursor = "") Export
     
     URL = "https://slack.com/api/conversations.members";
@@ -399,7 +399,7 @@ EndFunction
 // Private - Boolean - Create channel as private - private
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function CreateChannel(Val Token, Val Name, Val Private = False) Export
     
     URL = "https://slack.com/api/conversations.create";
@@ -423,7 +423,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function ArchiveChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.archive";
@@ -440,7 +440,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.info";
@@ -457,7 +457,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetChannelHistory(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.history";
@@ -475,7 +475,7 @@ EndFunction
 // ArrayOfUsers - Array Of String - User ID Array - users
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function InviteUsersToChannel(Val Token, Val Channel, Val ArrayOfUsers) Export
     
     URL = "https://slack.com/api/conversations.invite";
@@ -503,7 +503,7 @@ EndFunction
 // User - String - User ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function KickUserFromChannel(Val Token, Val Channel, Val User) Export
     
     URL = "https://slack.com/api/conversations.kick";
@@ -527,7 +527,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function JoinChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.join";
@@ -544,7 +544,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function LeaveChannel(Val Token, Val Channel) Export
     
     URL = "https://slack.com/api/conversations.leave";
@@ -562,7 +562,7 @@ EndFunction
 // Topic - String - Channel topic - theme
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SetChannelTopic(Val Token, Val Channel, Val Topic) Export
     
     URL = "https://slack.com/api/conversations.setTopic";
@@ -587,7 +587,7 @@ EndFunction
 // Purpose - String - Channel purpose - purpose
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SetChannelGoal(Val Token, Val Channel, Val Purpose) Export
     
     URL = "https://slack.com/api/conversations.setPurpose";
@@ -612,7 +612,7 @@ EndFunction
 // Name - String - New channel name - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function RenameChannel(Val Token, Val Channel, Val Name) Export
     
     URL = "https://slack.com/api/conversations.rename";
@@ -640,7 +640,7 @@ EndFunction
 // ArrayOfUsers - Array of String - User ID Array - users
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function OpenDialog(Val Token, Val ArrayOfUsers) Export
     
     URL = "https://slack.com/api/conversations.open";
@@ -666,7 +666,7 @@ EndFunction
 // Dialog - String - Dialog ID - conv
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function CloseDialog(Val Token, Val Dialog) Export
     
     URL = "https://slack.com/api/conversations.close";
@@ -688,7 +688,7 @@ EndFunction
 // PageNumber - Number, String - Page number - page
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetFilesList(Val Token, Val Channel = "", Val PageNumber = 1) Export
     
     URL = "https://slack.com/api/files.list";
@@ -715,7 +715,7 @@ EndFunction
 // Channel - String - Channel ID - channel
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function UploadFile(Val Token, Val File, Val FileName, Val Title, Val Channel = "") Export
     
     OPI_TypeConversion.GetBinaryData(File);
@@ -767,7 +767,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetFileData(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.info";
@@ -785,7 +785,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteFile(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.delete";
@@ -803,7 +803,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function MakeFilePublic(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.sharedPublicURL";
@@ -821,7 +821,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function MakeFilePrivate(Val Token, Val FileID) Export
     
     URL = "https://slack.com/api/files.revokePublicURL";
@@ -844,7 +844,7 @@ EndFunction
 // Cursor - String - Pointer from the previous request, if the result rows > 100 - cursor
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetExternalFileList(Val Token, Val Channel = "", Val Cursor = "") Export
     
     URL = "https://slack.com/api/files.remote.list";
@@ -868,7 +868,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function GetExternalFile(Val Token, Val FileID) Export
   
     URL = "https://slack.com/api/files.remote.info";
@@ -887,7 +887,7 @@ EndFunction
 // Title - String - File title for Slack - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function AddExternalFile(Val Token, Val URL, Val Title) Export
     
     String_ = "String";
@@ -915,7 +915,7 @@ EndFunction
 // ChannelArray - Array Of String - Array of channels for sending - channels
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function SendExternalFile(Val Token, Val FileID, Val ChannelArray) Export
     
     URL = "https://slack.com/api/files.remote.share";
@@ -942,7 +942,7 @@ EndFunction
 // FileID - String - File identifier - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Slack
+// Map Of KeyAndValue - Serialized JSON response from Slack
 Function DeleteExternalFile(Val Token, Val FileID) Export
   
     URL = "https://slack.com/api/files.remote.remove";
@@ -964,7 +964,7 @@ EndFunction
 // AlternateText - String - Alternate text of the image - alt
 // 
 // Returns:
-// Key-Value Pair - Image block
+// Map Of KeyAndValue - Image block
 Function GenerateImageBlock(Val URL, Val AlternateText = "") Export
     
     String_ = "String";
diff --git a/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl
index 81aa8d0ace..5b74ec83fe 100644
--- a/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Telegram/Module.bsl
@@ -50,7 +50,7 @@
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetBotInformation(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -71,7 +71,7 @@ EndFunction
 // Offset - String, Number - Offset in the list of received messages - offset
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetUpdates(Val Token, Val Timeout = 0, Val Offset = "") Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -95,7 +95,7 @@ EndFunction
 // URL - String - Request handling address from Telegram (with https:) - url
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SetWebhook(Val Token, Val URL) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -117,7 +117,7 @@ EndFunction
 // Token - String - Bot token - token
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DeleteWebhook(Val Token) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -137,7 +137,7 @@ EndFunction
 // FileID - String - File ID for downloading - fileid
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DownloadFile(Val Token, Val FileID) Export
 
     Result = "result";
@@ -178,7 +178,7 @@ Function ProcessTMAData(Val DataString, Val Token) Export
     OPI_TypeConversion.GetLine(DataString);
     
     DataString = DecodeString(DataString, StringEncodingMethod.URLencoding);
-    DataStructure = OPI_Tools.RequestParametersToMatch(DataString);
+    DataStructure = OPI_Tools.RequestParametersToMap(DataString);
     Key = "WebAppData";
     Hash = "";
     BinaryKey = GetBinaryDataFromString(Key);
@@ -245,7 +245,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendTextMessage(Val Token
 	, Val ChatID
 	, Val Text
@@ -281,7 +281,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendImage(Val Token
 	, Val ChatID
 	, Val Text
@@ -305,7 +305,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendVideo(Val Token
 	, Val ChatID
 	, Val Text
@@ -329,7 +329,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendAudio(Val Token
 	, Val ChatID
 	, Val Text
@@ -353,7 +353,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendDocument(Val Token
 	, Val ChatID
 	, Val Text
@@ -377,7 +377,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendGif(Val Token
 	, Val ChatID
 	, Val Text
@@ -401,7 +401,7 @@ EndFunction
 // Markup - String - Text processing type (HTML, Markdown, MarkdownV2) - parsemode
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendMediaGroup(Val Token
 	, Val ChatID
 	, Val Text
@@ -452,7 +452,7 @@ EndFunction
 // Keyboard - String - See GenerateKeyboardFromArray - keyboard - Keyboard JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendLocation(Val Token, Val ChatID, Val Latitude, Val Longitude, Val Keyboard = "") Export
 
 	String_ = "String";
@@ -487,7 +487,7 @@ EndFunction
 // Keyboard - String - See GenerateKeyboardFromArray - keyboard - Keyboard JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendContact(Val Token, Val ChatID, Val Name, Val LastName, Val Phone, Val Keyboard = "") Export
 
 	String_ = "String";
@@ -522,7 +522,7 @@ EndFunction
 // Anonymous - Boolean - Poll anonymity - anonymous
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function SendPoll(Val Token, Val ChatID, Val Question, Val AnswersArray, Val Anonymous = True) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -557,7 +557,7 @@ EndFunction
 // ToID - String, Number - Target chat ID or ChatID*TopicID - to
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ForwardMessage(Val Token, Val OriginalID, Val FromID, Val ToID) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -628,7 +628,7 @@ EndFunction
 // UserID - String, Number - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function Ban(Val Token, Val ChatID, Val UserID) Export
 
 	String_ = "String";
@@ -656,7 +656,7 @@ EndFunction
 // UserID - String, Number - Target user ID - user
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function Unban(Val Token, Val ChatID, Val UserID) Export
 
 	String_ = "String";
@@ -687,7 +687,7 @@ EndFunction
 // UserLimit - Number - User limit (infinite if not specified) - limit
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CreateInvitationLink(Val Token
     , Val ChatID
     , Val Title = ""
@@ -721,7 +721,7 @@ EndFunction
 // MessageID - String, Number - Target message ID - message
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function PinMessage(Val Token, Val ChatID, Val MessageID) Export
     
     String_ = "String";
@@ -750,7 +750,7 @@ EndFunction
 // MessageID - String, Number - Target message ID - message
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function UnpinMessage(Val Token, Val ChatID, Val MessageID) Export
     
     String_ = "String";
@@ -777,7 +777,7 @@ EndFunction
 // ChatID - String, Number - Target chat ID - chat
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function GetParticipantCount(Val Token, Val ChatID) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -805,7 +805,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - Key > ID, Value > Emoji
+// Map Of KeyAndValue - Key > ID, Value > Emoji
 Function GetAvatarIconList(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -839,7 +839,7 @@ EndFunction
 // IconID - String - See GetAvatarIconList - icon
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CreateForumThread(Val Token, Val ChatID, Val Title, Val IconID = "") Export
     Return ForumTopicManagement(Token, ChatID, Title, IconID);
 EndFunction
@@ -855,7 +855,7 @@ EndFunction
 // IconID - String - See GetAvatarIconList - icon
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function EditForumTopic(Val Token
     , Val ChatID
     , Val ThreadID
@@ -874,7 +874,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function CloseForumThread(Val Token, Val ChatID, Val ThreadID = "") Export
     Return ManageForumThreadState(Token, ChatID, 2, ThreadID);    
 EndFunction
@@ -888,7 +888,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function OpenForumThread(Val Token, Val ChatID, Val ThreadID = "") Export
     Return ManageForumThreadState(Token, ChatID, 1, ThreadID);    
 EndFunction
@@ -902,7 +902,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function DeleteForumTopic(Val Token, Val ChatID, Val ThreadID) Export
     Return ManageForumThreadState(Token, ChatID, 3, ThreadID);    
 EndFunction
@@ -915,7 +915,7 @@ EndFunction
 // ChatID - String, Number - Thread chat ID - forum
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function HideMainForumTopic(Val Token, Val ChatID) Export
     Return ManageMainTopicVisibility(Token, ChatID, True);
 EndFunction
@@ -928,7 +928,7 @@ EndFunction
 // ChatID - String, Number - Thread chat ID - forum
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ShowMainForumTopic(Val Token, Val ChatID) Export
     Return ManageMainTopicVisibility(Token, ChatID, False);
 EndFunction
@@ -942,7 +942,7 @@ EndFunction
 // Title - String - New main thread name - title
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function EditMainForumTopicName(Val Token, Val ChatID, Val Title) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -968,7 +968,7 @@ EndFunction
 // ThreadID - String, Number - Thread ID. Main if not filled - topic
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from Telegram
+// Map Of KeyAndValue - Serialized JSON response from Telegram
 Function ClearThreadPinnedMessagesList(Val Token, Val ChatID, Val ThreadID = "") Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl
index 19432d62ce..a129b9c656 100644
--- a/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Tests/Module.bsl
@@ -413,7 +413,7 @@ Procedure VKAPI_LikeRepostComment() Export
     Parameters = GetVKParameters();
     Text = "Post from autotest";
     Message = "Message from autotest";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     
@@ -426,7 +426,7 @@ Procedure VKAPI_LikeRepostComment() Export
     
     OPI_Tools.Pause(5);
       
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["likes"]).ИмеетТип(TypeNumber).Заполнено();
         
     ExternalPost = 2571;
@@ -438,7 +438,7 @@ Procedure VKAPI_LikeRepostComment() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["success"]).ИмеетТип(TypeNumber).Равно(1);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["wall_repost_count"]).ИмеетТип(TypeNumber).Равно(1); 
         
@@ -448,7 +448,7 @@ Procedure VKAPI_LikeRepostComment() Export
         
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["comment_id"]).ИмеетТип(TypeNumber).Заполнено();
    
     OPI_VK.DeletePost(PostID, Parameters);
@@ -464,15 +464,15 @@ Procedure VKAPI_GetStatistics() Export
     Parameters = GetVKParameters();
     Date0 = BegOfDay(CurrentDate);
     Date1 = EndOfDay(Date0);
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
      
     Result = OPI_VK.GetStatistics(Date0, Date1, Parameters);
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "GetStatistics");
         
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch).Заполнено();
-    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["visitors"]).ИмеетТип(TypeMatch).Заполнено();
-    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["reach"]).ИмеетТип(TypeMatch).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["visitors"]).ИмеетТип(TypeMap).Заполнено();
+    OPI_TestDataRetrieval.ExpectsThat(Result["response"][0]["reach"]).ИмеетТип(TypeMap).Заполнено();
     
     OPI_Tools.Pause(5);
 
@@ -501,7 +501,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     Parameters = GetVKParameters();
     CabinetID = OPI_TestDataRetrieval.GetParameter("VK_AdsCabinetID");
     Name = "Test ads";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     UID_ = "id";
@@ -512,7 +512,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result["error_code"]).ИмеетТип(TypeNumber).Равно(602);
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
         
@@ -534,7 +534,7 @@ Procedure VKAPI_CreateAdCampaign() Export
             
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result["error_code"]).ИмеетТип(TypeNumber).Равно(602);
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
         
@@ -545,7 +545,7 @@ Procedure VKAPI_CreateAdCampaign() Export
     
     Result = Result[Response_][0];
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[UID_]).ИмеетТип(TypeNumber).Заполнено();
  
     OPI_VK.DeletePost(PostID, Parameters);
@@ -595,7 +595,7 @@ EndProcedure
 Procedure VKAPI_CreateProductSelection() Export
  
     Parameters = GetVKParameters();
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     Response_ = "response";
     Image = OPI_TestDataRetrieval.GetBinary("Picture");
@@ -612,7 +612,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["albums_count"]).ИмеетТип(TypeNumber).Заполнено();
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["market_album_id"]).ИмеетТип(TypeNumber).Заполнено();
              
@@ -624,7 +624,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]).ИмеетТип(TypeNumber).Равно(1);
  
     ImageArray = New Array;
@@ -652,7 +652,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "AddProduct");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["market_item_id"]).ИмеетТип(TypeNumber).Заполнено();
         
     ProductID = Result[Response_]["market_item_id"];
@@ -672,7 +672,7 @@ Procedure VKAPI_CreateProductSelection() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]).ИмеетТип(TypeNumber).Заполнено();
         
     Result = OPI_VK.RemoveProductFromSelection(ProductID, SelectionID, Parameters); // Deletes from selections
@@ -705,7 +705,7 @@ EndProcedure
 Procedure VKAPI_CreateProductWithProperties() Export
  
     Parameters = GetVKParameters();
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeNumber = Type("Number");
     MII_ = "market_item_id";
     Response_ = "response";
@@ -729,9 +729,9 @@ Procedure VKAPI_CreateProductWithProperties() Export
     Property = Result[Response_]["property_id"];
     Property = OPI_Tools.NumberToString(Property);
      
-    PropertyMatch = New Map;
+    PropertyMap = New Map;
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["property_id"]).ИмеетТип(TypeNumber).Заполнено();
         
     Result = OPI_VK.EditProductProperty("Color (change.)", Property, Parameters);
@@ -750,11 +750,11 @@ Procedure VKAPI_CreateProductWithProperties() Export
         
         OPI_Tools.Pause(5);
         
-        OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+        OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
         OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["variant_id"]).ИмеетТип(TypeNumber).Заполнено();
             
         VariantID = Result[Response_]["variant_id"];
-        PropertyMatch.Insert(Option, VariantID);
+        PropertyMap.Insert(Option, VariantID);
         
         Result = OPI_VK.EditProductPropertyVariant(Option + String(New UUID())
             , Property
@@ -788,7 +788,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     Product.Insert("Weight" , 100);
     Product.Insert("SKU" , 12345);
     Product.Insert("AvailableBalance" , "10");
-    Product.Insert("PropertyValues" , PropertyMatch[Yellow_]);
+    Product.Insert("PropertyValues" , PropertyMap[Yellow_]);
     
     Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product  
     
@@ -798,11 +798,11 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     YellowID = Result[Response_]["market_item_id"];               
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено();
         
     Product.Insert("Name" , "TestProduct (" + Red_ + ")");
-    Product.Insert("PropertyValues", PropertyMatch[Red_]);
+    Product.Insert("PropertyValues", PropertyMap[Red_]);
 
     Result = OPI_VK.AddProduct(Product, , Parameters); // Adding product
     
@@ -812,7 +812,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     RedID = Result[Response_][MII_];               
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_][MII_]).ИмеетТип(TypeNumber).Заполнено();
         
     ProductsArray = New Array;
@@ -825,7 +825,7 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["items"]).ИмеетТип("Array").ИмеетДлину(2);
         
     Result = OPI_VK.GroupProducts(ProductsArray, , Parameters);
@@ -834,13 +834,13 @@ Procedure VKAPI_CreateProductWithProperties() Export
     
     OPI_Tools.Pause(5);
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch);
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap);
     OPI_TestDataRetrieval.ExpectsThat(Result[Response_]["item_group_id"]).ИмеетТип(TypeNumber).Заполнено();
        
     OPI_VK.DeleteProduct(YellowID , Parameters);
     OPI_VK.DeleteProduct(RedID, Parameters);
     
-    For Each Option In PropertyMatch Do
+    For Each Option In PropertyMap Do
         
         Deletion = OPI_VK.DeleteProductPropertyVariant(Option.Value, Parameters);
         
@@ -1564,7 +1564,7 @@ Procedure GC_CreateDeleteCalendar() Export
     Name = "TestCalendar";
     Description = "TestDescription";
     EditedName = Name + " (change.)";
-    TypeMatch = Type("Map");
+    TypeMap = Type("Map");
     TypeString = Type("String");
     Summary = "summary";
     Black = "#000000";
@@ -1574,7 +1574,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "CreateCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(Name);
     OPI_TestDataRetrieval.ExpectsThat(Result["id"]).ИмеетТип(TypeString).Заполнено();
         
@@ -1605,7 +1605,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "EditListCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(EditedName);
     OPI_TestDataRetrieval.ExpectsThat(Result["foregroundColor"]).Равно(Black);
     OPI_TestDataRetrieval.ExpectsThat(Result["backgroundColor"]).Равно(Yellow);
@@ -1614,7 +1614,7 @@ Procedure GC_CreateDeleteCalendar() Export
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "GetListCalendar");
     
-    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMatch); 
+    OPI_TestDataRetrieval.ExpectsThat(Result).ИмеетТип(TypeMap); 
     OPI_TestDataRetrieval.ExpectsThat(Result[Summary]).Равно(EditedName);
     OPI_TestDataRetrieval.ExpectsThat(Result["foregroundColor"]).Равно(Black);
     OPI_TestDataRetrieval.ExpectsThat(Result["backgroundColor"]).Равно(Yellow);
@@ -1659,16 +1659,16 @@ Procedure GC_CreateDeleteEvent() Export
     Attachments.Insert("Image2"
         , "https://github.com/Bayselonarrend/OpenIntegrations/raw/main/Media/logo.png?v1");
     
-    EventMatch = New Map;
-    EventMatch.Insert("Description" , Description);
-    EventMatch.Insert("Title" , Name);
-    EventMatch.Insert("Venue" , "InOffice");
-    EventMatch.Insert("StartDate" , CurrentDate);
-    EventMatch.Insert("EndDate" , EventMatch["StartDate"] + Hour);
-    EventMatch.Insert("ArrayOfAttachmentURLs" , Attachments);
-    EventMatch.Insert("SendNotifications" , True);
+    EventMap = New Map;
+    EventMap.Insert("Description" , Description);
+    EventMap.Insert("Title" , Name);
+    EventMap.Insert("Venue" , "InOffice");
+    EventMap.Insert("StartDate" , CurrentDate);
+    EventMap.Insert("EndDate" , EventMap["StartDate"] + Hour);
+    EventMap.Insert("ArrayOfAttachmentURLs" , Attachments);
+    EventMap.Insert("SendNotifications" , True);
     
-    Result = OPI_GoogleCalendar.CreateEvent(Token, Calendar, EventMatch);
+    Result = OPI_GoogleCalendar.CreateEvent(Token, Calendar, EventMap);
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "CreateEvent");
     
@@ -1676,10 +1676,10 @@ Procedure GC_CreateDeleteEvent() Export
     
     Check_GKObject(Result, Name, Description);
       
-    EventMatch = New Map;  
-    EventMatch.Insert("Description", EditedDescription);
+    EventMap = New Map;  
+    EventMap.Insert("Description", EditedDescription);
     
-    Result = OPI_GoogleCalendar.EditEvent(Token, Calendar, EventMatch, Event);
+    Result = OPI_GoogleCalendar.EditEvent(Token, Calendar, EventMap, Event);
     
     // !OInt OPI_TestDataRetrieval.WriteLog(Result, "EditEvent");
     
diff --git a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
index 9fce6f6906..1e3b761e8a 100644
--- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
@@ -334,7 +334,7 @@ Function ReadJSONFile(Val Path) Export
     
 EndFunction
 
-Function RequestParametersToMatch(Val ParameterString) Export
+Function RequestParametersToMap(Val ParameterString) Export
 
     ReturnMapping = New Map;
     NumberOfParts = 2;
diff --git a/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl
index 1f05a0f842..9e34be2410 100644
--- a/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Twitter/Module.bsl
@@ -83,7 +83,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function GetToken(Val Code, Val Parameters = "") Export
 
     OPI_TypeConversion.GetLine(Code);
@@ -111,7 +111,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function RefreshToken(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -169,7 +169,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateCustomTweet(Val Text = ""
     , Val MediaArray = ""
     , Val PollOptionsArray = ""
@@ -230,7 +230,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateTextTweet(Val Text, Val Parameters = "") Export
     Return CreateCustomTweet(Text, , , , Parameters);    
 EndFunction
@@ -244,7 +244,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateImageTweet(Val Text, Val ImageArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(ImageArray, "photo", Parameters);
@@ -261,7 +261,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateGifTweet(Val Text, Val GifsArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(GifsArray, "animated_gif", Parameters);
@@ -278,7 +278,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreateVideoTweet(Val Text, Val VideosArray, Val Parameters = "") Export
     
     MediaArray = UploadAttachmentsArray(VideosArray, "video", Parameters);
@@ -296,7 +296,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Twitter
+// Map Of KeyAndValue - serialized JSON response from Twitter
 Function CreatePollTweet(Val Text, Val OptionArray, Val Duration, Val Parameters = "") Export
     Return CreateCustomTweet(Text, , OptionArray, Duration, Parameters);    
 EndFunction
@@ -492,7 +492,7 @@ Function GetStandardParameters(Val Parameters = "")
     // The world gigacorporation of Elon Musk, by the way, a reminder ;)
     
     // P.S The "Twitter Developer settings page" is often mentioned further" - this 
-    // https://developer.twitter.com/en/portal/dashboard и inыбор toонtoретного проеtoта from withпиwithtoа (зtoчеto c toлючем)
+    // https://developer.twitter.com/en/portal/dashboard and inыбор toонtoретного проеtoта from withпandwithtoа (зtoчеto c toлючем)
     
     Parameters_ = New Map; 
     Permissions = "tweet.read tweet.write tweet.moderate.write users.read "
@@ -512,7 +512,7 @@ Function GetStandardParameters(Val Parameters = "")
     // For the next update, you need to use a new refresh_token, so hardcode 
     // won't work (access_token won't work either) 
     
-    // |--> RefreshToken() ->|access_token --> Andwithпользуетwithя in т-нии 2-х чаwithоin for запроwithоin
+    // |--> RefreshToken() ->|access_token --> Andwithпользуетwithя in т-нandand 2-х чаwithin for запроwithin
     // | |refresh_token --|
     // |--------[after 2 hrs.]-------------------|
      
diff --git a/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl b/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl
index 7243465717..c74458583e 100644
--- a/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_VK/Module.bsl
@@ -83,7 +83,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreatePost(Val Text
     , Val ImageArray
     , Val Advertisement = False
@@ -98,13 +98,13 @@ Function CreatePost(Val Text
     For Each PostImage In ImageArray Do
         
         Parameters_ = GetStandardParameters(Parameters);
-        ResponseCorrespondence = GetImageCorrespondence(PostImage, Parameters_, "Post");
+        ResponseMap = GetImageMap(PostImage, Parameters_, "Post");
         
-        OwnerId = ResponseCorrespondence.Get("owner_id");
-        ObjectId = ResponseCorrespondence.Get("id");
+        OwnerId = ResponseMap.Get("owner_id");
+        ObjectId = ResponseMap.Get("id");
         
         If Not ValueIsFilled(OwnerId) Or Not ValueIsFilled(ObjectId) Then
-        	Return ResponseCorrespondence;
+        	Return ResponseMap;
         EndIf;
         
         OwnerId = OPI_Tools.NumberToString(OwnerId);
@@ -133,7 +133,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateCompositePost(Val Text
     , Val Objects
     , Val Advertisement = False
@@ -167,7 +167,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeletePost(Val PostID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(PostID);
@@ -191,7 +191,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreatePoll(Val Question, Val AnswersArray, Val Image = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Question);
@@ -231,14 +231,14 @@ Function CreatePoll(Val Question, Val AnswersArray, Val Image = "", Val Paramete
     Parameters_.Insert("question" , Question);
     
     Poll = OPI_Tools.Get("api.vk.com/method/polls.create", Parameters_);
-    PollCorrespondence = Poll.Get(Response_);
+    PollMap = Poll.Get(Response_);
     
-    If Not ValueIsFilled(PollCorrespondence) Then
+    If Not ValueIsFilled(PollMap) Then
     	Return Poll;
     EndIf;
     
-    OwnerId = PollCorrespondence.Get("owner_id");
-    ObjectId = PollCorrespondence.Get("id");
+    OwnerId = PollMap.Get("owner_id");
+    ObjectId = PollMap.Get("id");
     
     If Not ValueIsFilled(OwnerId) Or Not ValueIsFilled(ObjectId) Then
         Return Poll;
@@ -266,7 +266,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAlbum(Val Name, Val Description = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -292,7 +292,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteAlbum(Val AlbumID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AlbumID);
@@ -315,7 +315,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateStory(Val Image, Val URL = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(URL);
@@ -340,7 +340,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function SaveImageToAlbum(Val AlbumID, Val Image, Val Description = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AlbumID);
@@ -363,7 +363,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteImage(Val ImageID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(ImageID);
@@ -388,7 +388,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function UploadVideoToServer(Val Video
     , Val Name
     , Val Description = ""
@@ -437,7 +437,7 @@ EndFunction
 // View - String - Upload type (Post, Product, Story, Poll, Other) - type
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function UploadPhotoToServer(Val Image, Val Parameters = "", Val View = "Post") Export
        
     Parameters = GetStandardParameters(Parameters);
@@ -509,7 +509,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateDiscussion(Val Name, Val FirstMessageText, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -534,7 +534,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CloseDiscussion(Val DiscussionID, Val DeleteCompletely = False, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -558,7 +558,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function OpenDiscussion(Val DiscussionID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -581,7 +581,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteInDiscussion(Val DiscussionID, Val Text, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(DiscussionID);
@@ -610,7 +610,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function LikePost(Val PostID, Val WallID = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(PostID);
@@ -643,7 +643,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function MakeRepost(Val PostID
     , Val WallID = ""
     , Val TargetWall = ""
@@ -683,7 +683,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteMessage(Val Text
     , Val UserID
     , Val Communitytoken
@@ -724,7 +724,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function WriteComment(Val PostID, Val WallID, Val Text, Val Parameters = "") Export
 
     Parameters_ = GetStandardParameters(Parameters);
@@ -798,7 +798,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetStatistics(Val StartDate, Val EndDate, Val Parameters = "") Export
     
     OPI_TypeConversion.GetDate(StartDate);
@@ -889,7 +889,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAdvertisingCampaign(Val AccountID, Val Name, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AccountID);
@@ -938,7 +938,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateAd(Val CampaignNumber
     , Val DailyLimit
     , Val CategoryNumber
@@ -999,7 +999,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function PauseAdvertisingAd(Val AccountID, Val AdID, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(AccountID);
@@ -1034,7 +1034,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetAdvertisingCategoryList(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -1091,13 +1091,13 @@ Function GetProductCategoryList(Val Parameters = "") Export
     	Return Response;
     EndIf;
        
-    CategoryCorrespondence = New Map;
+    CategoryMap = New Map;
     
     For Each Category In Categories Do      
-        CategoryCorrespondence.Insert(Category["id"], Category["name"]);
+        CategoryMap.Insert(Category["id"], Category["name"]);
     EndDo;
        
-    Return CategoryCorrespondence;
+    Return CategoryMap;
     
 EndFunction
 
@@ -1109,7 +1109,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Array of product matches
+// Map Of KeyAndValue - Array of product maps
 Function GetProductList(Val Selection = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Selection);
@@ -1138,7 +1138,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetProductsByID(Val Products, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(Products);
@@ -1167,12 +1167,12 @@ EndFunction
 // Adds a new product to the community's catalog
 //
 // Parameters:
-// ProductDescription - Key-Value Pair - See GetProductDescription - product - JSON description of the product or path
+// ProductDescription - Map Of KeyAndValue - See GetProductDescription - product - JSON description of the product or path
 // Selection - String - Selection ID for placing the product, if needed - sel
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function AddProduct(Val ProductDescription, Val Selection = "", Val Parameters = "") Export        
     Return ProductManagement(ProductDescription, , Selection, Parameters);    
 EndFunction
@@ -1182,12 +1182,12 @@ EndFunction
 //
 // Parameters:
 // Product - Number, String - Identifier of the product being edited - item
-// ProductDescription - Key-Value Pair - See GetProductDescription - product - JSON description of the product or path
+// ProductDescription - Map Of KeyAndValue - See GetProductDescription - product - JSON description of the product or path
 // Selection - String - Identifier of the new selection, if needed - sel 
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function EditProduct(Val Product, Val ProductDescription, Val Selection = "", Val Parameters = "") Export
     Return ProductManagement(ProductDescription, Product, Selection, Parameters);    
 EndFunction
@@ -1200,7 +1200,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteProduct(Val Product, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Product);
@@ -1223,7 +1223,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GroupProducts(Val ProductsArray, Val ExistingGroup = "", Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(ExistingGroup);
@@ -1253,7 +1253,7 @@ EndFunction
 // Get product description. !NOCLI
 // 
 // Returns:
-// Key-Value Pair - Empty product description:
+// Map Of KeyAndValue - Empty product description:
 // *Name - String - Product name
 // *Description - String - Product description
 // *Category - String - See GetProductCategoryList
@@ -1305,7 +1305,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Array of selection matches
+// Map Of KeyAndValue - Array of selection maps
 Function GetSelectionList(Val Parameters = "") Export
     
     Parameters_ = GetStandardParameters(Parameters);
@@ -1326,7 +1326,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function GetSelectionsByID(Val Selections, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(Selections);
@@ -1360,7 +1360,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function CreateProductCollection(Val Name
     , Val Image
     , Val Main = False
@@ -1383,7 +1383,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function EditProductCollection(Val Name
     , Val Selection
     , Val Image = ""
@@ -1404,7 +1404,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function AddProductToSelection(Val ProductsArray, Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetCollection(ProductsArray);
@@ -1437,7 +1437,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function RemoveProductFromSelection(Val Product, Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Product);
@@ -1454,7 +1454,7 @@ Function RemoveProductFromSelection(Val Product, Val Selection, Val Parameters =
     
 EndFunction
 
-// DeleteSelection
+// Delete selection
 // Deletes the selection by ID
 //
 // Parameters:
@@ -1462,7 +1462,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK
+// Map Of KeyAndValue - Serialized JSON response from VK
 Function DeleteSelection(Val Selection, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Selection);
@@ -1487,7 +1487,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function GetPropertyList(Val Parameters = "") Export
     
     Response_ = "response";
@@ -1508,7 +1508,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function CreateProductProperty(Val Name, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -1531,7 +1531,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function EditProductProperty(Val Name, Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Name);
@@ -1556,7 +1556,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function DeleteProductProperty(Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Property);
@@ -1579,7 +1579,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK    
+// Map Of KeyAndValue - Serialized JSON response from VK    
 Function AddProductPropertyVariant(Val Value, Val Property, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Property);
@@ -1605,7 +1605,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK      
+// Map Of KeyAndValue - Serialized JSON response from VK      
 Function EditProductPropertyVariant(Val Value, Val Property, Val Option, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Value);
@@ -1631,7 +1631,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK     
+// Map Of KeyAndValue - Serialized JSON response from VK     
 Function DeleteProductPropertyVariant(Val Option, Val Parameters = "") Export
     
     OPI_TypeConversion.GetLine(Option);
@@ -1656,7 +1656,7 @@ EndFunction
 // Parameters - Structure Of String - See GetStandardParameters - auth - Authorization JSON or path to .json
 // 
 // Returns:
-// Key-Value Pair - Serialized JSON response from VK 
+// Map Of KeyAndValue - Serialized JSON response from VK 
 Function GetOrderList(Val Parameters = "") Export
     
     Parameters = GetStandardParameters(Parameters);
@@ -1773,7 +1773,7 @@ Function GetImageID(Val Image, Val Parameters, Val View)
     
 EndFunction
 
-Function GetImageCorrespondence(Val Image, Val Parameters, Val View)
+Function GetImageMap(Val Image, Val Parameters, Val View)
 	
 	Response = UploadPhotoToServer(Image, Parameters, View);   
     ResponseArray = Response.Get("response");
@@ -1784,11 +1784,11 @@ Function GetImageCorrespondence(Val Image, Val Parameters, Val View)
     	If ResponseArray.Count() = 0 Then
     		Return Response;
     	Else
-    		ResponseCorrespondence = ResponseArray[0];
+    		ResponseMap = ResponseArray[0];
     	EndIf;
     EndIf;
      
-    Return ResponseCorrespondence;
+    Return ResponseMap;
        
 EndFunction
 
@@ -1816,7 +1816,7 @@ EndFunction
 
 Function DetermineImageUploadMethod(Val View)
     
-    MethodCorrespondence = New Map;
+    MethodMap = New Map;
     Upload = "Upload";
     Save = "Save";
     Way = "Way";
@@ -1824,40 +1824,40 @@ Function DetermineImageUploadMethod(Val View)
     
     If View = "Post" Then
        
-        MethodCorrespondence.Insert(Upload , "photos.getWallUploadServer");
-        MethodCorrespondence.Insert(Save, "photos.saveWallPhoto");
-        MethodCorrespondence.Insert(Photo , "photo");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "photos.getWallUploadServer");
+        MethodMap.Insert(Save, "photos.saveWallPhoto");
+        MethodMap.Insert(Photo , "photo");
+        MethodMap.Insert(Way , 1);
         
     ElsIf View = "Product" Then
         
-        MethodCorrespondence.Insert(Upload , "market.getProductPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "market.saveProductPhoto");
-        MethodCorrespondence.Insert(Way , 2);
+        MethodMap.Insert(Upload , "market.getProductPhotoUploadServer");
+        MethodMap.Insert(Save, "market.saveProductPhoto");
+        MethodMap.Insert(Way , 2);
         
     ElsIf View = "Story" Then
         
-        MethodCorrespondence.Insert(Upload , "stories.getPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "stories.save");
-        MethodCorrespondence.Insert(Way , 3);
+        MethodMap.Insert(Upload , "stories.getPhotoUploadServer");
+        MethodMap.Insert(Save, "stories.save");
+        MethodMap.Insert(Way , 3);
     
     ElsIf View = "Poll" Then
         
-        MethodCorrespondence.Insert(Upload , "polls.getPhotoUploadServer");
-        MethodCorrespondence.Insert(Save, "polls.savePhoto");
-        MethodCorrespondence.Insert(Photo , "photo");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "polls.getPhotoUploadServer");
+        MethodMap.Insert(Save, "polls.savePhoto");
+        MethodMap.Insert(Photo , "photo");
+        MethodMap.Insert(Way , 1);
         
     Else
         
-        MethodCorrespondence.Insert(Upload , "photos.getUploadServer");
-        MethodCorrespondence.Insert(Save, "photos.save");
-        MethodCorrespondence.Insert(Photo , "photos_list");
-        MethodCorrespondence.Insert(Way , 1);
+        MethodMap.Insert(Upload , "photos.getUploadServer");
+        MethodMap.Insert(Save, "photos.save");
+        MethodMap.Insert(Photo , "photos_list");
+        MethodMap.Insert(Way , 1);
         
     EndIf;
     
-    Return MethodCorrespondence;
+    Return MethodMap;
     
 EndFunction
 
diff --git a/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl b/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl
index d938c5c098..1d6ffea594 100644
--- a/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Viber/Module.bsl
@@ -51,7 +51,7 @@
 // URL - String - URL for setting up Webhook - url
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SetWebhook(Val Token, Val URL) Export
     
     Parameters = New Structure;
@@ -70,7 +70,7 @@ EndFunction
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetChannelInformation(Val Token) Export
     
     URL = "https://chatapi.viber.com/pa/get_account_info";   
@@ -86,7 +86,7 @@ EndFunction
 // UserID - String, Number - Viber User ID - user
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetUserData(Val Token, Val UserID) Export
     
     URL = "https://chatapi.viber.com/pa/get_user_details";
@@ -108,7 +108,7 @@ EndFunction
 // UserIDs - String,Number,Array of String,Number - Viber User(s) ID - users
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function GetOnlineUsers(Val Token, Val UserIDs) Export
     
     URL = "https://chatapi.viber.com/pa/get_online";
@@ -137,7 +137,7 @@ EndFunction
 // Keyboard - Structure Of String - See CreateKeyboardFromArrayButton - keyboard
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendTextMessage(Val Token
     , Val Text
     , Val UserID
@@ -159,7 +159,7 @@ EndFunction
 // Description - String - Image annotation - description
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendImage(Val Token, Val URL, Val UserID, Val SendingToChannel, Val Description = "") Export
     
     Return SendMessage(Token, "picture", UserID, SendingToChannel, URL, Description);
@@ -178,7 +178,7 @@ EndFunction
 // Size - Number - File size. If not filled in > determined automatically by downloading the file - size
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendFile(Val Token
     , Val URL
     , Val UserID
@@ -216,7 +216,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendContact(Val Token
     , Val ContactName
     , Val PhoneNumber
@@ -242,7 +242,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendLocation(Val Token, Val Latitude, Val Longitude, Val UserID, Val SendingToChannel) Export
     
     Parameters = New Structure;
@@ -263,7 +263,7 @@ EndFunction
 // SendingToChannel - Boolean - Sending to channel or bot chat - ischannel
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Viber
+// Map Of KeyAndValue - serialized JSON response from Viber
 Function SendLink(Val Token, Val URL, Val UserID, Val SendingToChannel) Export
     
     Return SendMessage(Token, "url", UserID, SendingToChannel, URL);
@@ -323,7 +323,7 @@ EndFunction
 // UserID - String, Number - Viber User ID
 // IsChannel - Boolean - Sending to channel or bot chat
 // Value - String, Structure - Value:
-// * URL - String - При отпраintoе URL
+// * URL - String - Прand отпраintoе URL
 // * Size - Number, String - File size in case of sending
 // * Extension - String - File extension in case of sending
 // Text - String - Message text
diff --git a/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl
index 5d9cd6fa52..5c4e89cddf 100644
--- a/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_YandexDisk/Module.bsl
@@ -50,7 +50,7 @@
 // Token - String - Token - token
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDiskInformation(Val Token) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -70,7 +70,7 @@ EndFunction
 // Path - String - Path to the created folder - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CreateFolder(Val Token, Val Path) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -106,7 +106,7 @@ EndFunction
 // Path - String - Path to folder or file - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetObject(Val Token, Val Path) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -131,7 +131,7 @@ EndFunction
 // ToCart - Boolean - To cart - can
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function DeleteObject(Val Token, Val Path, Val ToCart = True) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -160,7 +160,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CreateObjectCopy(Val Token, Val Original, Val Path, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -200,7 +200,7 @@ EndFunction
 // Path - String - Path to the file for downloading - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDownloadLink(Val Token, Val Path) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -257,7 +257,7 @@ EndFunction
 // SortByDate - Boolean - True > sort by date, False > alphabetically - datesort
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetFilesList(Val Token
     , Val Count = 0
     , Val OffsetFromStart = 0
@@ -308,7 +308,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function MoveObject(Val Token, Val Original, Val Path, Val Overwrite = False) Export
 
     OPI_TypeConversion.GetLine(Token);
@@ -349,7 +349,7 @@ EndFunction
 // Overwrite - Boolean - Overwrite if a file with the same name already exists - rewrite
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex 
+// Map Of KeyAndValue - serialized JSON response from Yandex 
 Function UploadFile(Val Token, Val Path, Val File, Val Overwrite = False) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -387,7 +387,7 @@ EndFunction
 // Address - String - File URL - url
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function UploadFileByURL(Val Token, Val Path, Val Address) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -420,7 +420,7 @@ EndFunction
 // Path - String - Path to the object to be published - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex 
+// Map Of KeyAndValue - serialized JSON response from Yandex 
 Function PublishObject(Val Token, Val Path) Export
     Return TogglePublicAccess(Token, Path, True);   
 EndFunction
@@ -433,7 +433,7 @@ EndFunction
 // Path - String - Path to the previously published object - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function CancelObjectPublication(Val Token, Val Path) Export
     Return TogglePublicAccess(Token, Path, False);
 EndFunction
@@ -447,7 +447,7 @@ EndFunction
 // OffsetFromStart - Number - Offset for getting objects not from the beginning of the list - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetPublishedObjectsList(Val Token, Val Count = 0, Val OffsetFromStart = 0) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -482,7 +482,7 @@ EndFunction
 // OffsetFromStart - Number - Offset for getting nested objects not from the beginning of the list - offset
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetPublicObject(Val Token, Val URL, Val Count = 0, Val OffsetFromStart = 0) Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -519,7 +519,7 @@ EndFunction
 // Path - String - Path inside the object - path
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetDownloadLinkForPublicObject(Val Token, Val URL, Val Path = "") Export
     
     OPI_TypeConversion.GetLine(Token);
@@ -552,7 +552,7 @@ EndFunction
 // Target - String - File save path - to
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function SavePublicObjectToDisk(Val Token, Val URL, From = "", Target = "") Export
     
     OPI_TypeConversion.GetLine(Token);
diff --git a/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl b/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl
index 5e8e6419fc..e7c2d04993 100644
--- a/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_YandexID/Module.bsl
@@ -45,7 +45,7 @@
 // ClientId - String - Client id - id
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function GetConfirmationCode(Val ClientId) Export
 
     OPI_TypeConversion.GetLine(ClientId);
@@ -66,7 +66,7 @@ EndFunction
 // DeviceCode - String - device_code from GetConfirmationCode() - device
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function ConvertCodeToToken(Val ClientId, Val ClientSecret, Val DeviceCode) Export
     
     OPI_TypeConversion.GetLine(ClientId);
@@ -94,7 +94,7 @@ EndFunction
 // RefreshToken - String - Refresh token - refresh
 // 
 // Returns:
-// Key-Value Pair - serialized JSON response from Yandex
+// Map Of KeyAndValue - serialized JSON response from Yandex
 Function RefreshToken(Val ClientId, Val ClientSecret, Val RefreshToken) Export
     
     OPI_TypeConversion.GetLine(ClientId);
diff --git a/src/en/OPI/src/Configuration/Configuration.mdo b/src/en/OPI/src/Configuration/Configuration.mdo
index e380aa161e..1d50629511 100644
--- a/src/en/OPI/src/Configuration/Configuration.mdo
+++ b/src/en/OPI/src/Configuration/Configuration.mdo
@@ -3,7 +3,7 @@
   <name>OpenIntegrations</name>
   <synonym>
     <key>en</key>
-    <value>Open integrations package</value>
+    <value>OpenIntegrations</value>
   </synonym>
   <objectBelonging>Adopted</objectBelonging>
   <extension xsi:type="mdclassExtension:ConfigurationExtension">
diff --git a/src/en/cli/data/Classes/internal/Classes/airtable.os b/src/en/cli/data/Classes/internal/Classes/airtable.os
index 643ab47b45..bba7d59956 100644
--- a/src/en/cli/data/Classes/internal/Classes/airtable.os
+++ b/src/en/cli/data/Classes/internal/Classes/airtable.os
@@ -60,7 +60,23 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "Database work";
-    НоваяСтрока.ОписаниеМетода   = "Creates a new database";
+    НоваяСтрока.ОписаниеМетода   = "Creates a new database
+    |
+    |    Структура JSON данных описания таблиц (параметр --tablesdata):
+    |  {
+    |    ""Имя таблицы 1"": [
+    |                         {
+    |                          <Данные описание поля 1>
+    |                         },
+    |                         {
+    |                          <Данные описание поля 2>
+    |                        },
+    |                       ],
+    |   ...
+    |  }
+    |
+    |Функции формирования описаний полей: ПолучитьПолеСтроковое, ПолучитьПолеНомера, ПолучитьПолеВложения, ПолучитьПолеФлажка, ПолучитьПолеДаты, ПолучитьПолеПочты, ПолучитьПолеТелефона, ПолучитьПолеСсылки
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -88,8 +104,8 @@
     НоваяСтрока.Модуль      = "OPI_Airtable";
     НоваяСтрока.Метод       = "CreateDatabase";
     НоваяСтрока.МетодПоиска = "CREATEDATABASE";
-    НоваяСтрока.Параметр    = "--Table description: Key > name, Value > array of fields";
-    НоваяСтрока.Описание    = "tablesdata";
+    НоваяСтрока.Параметр    = "--tablesdata";
+    НоваяСтрока.Описание    = "Table description: Key > name, Value > array of fields";
     НоваяСтрока.Область     = "Database work";
 
 
diff --git a/src/en/cli/data/Classes/internal/Classes/gcalendar.os b/src/en/cli/data/Classes/internal/Classes/gcalendar.os
index 380ddd3656..ac6e3259da 100644
--- a/src/en/cli/data/Classes/internal/Classes/gcalendar.os
+++ b/src/en/cli/data/Classes/internal/Classes/gcalendar.os
@@ -310,7 +310,24 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "Event management";
-    НоваяСтрока.ОписаниеМетода   = "Creates a new event";
+    НоваяСтрока.ОписаниеМетода   = "Creates a new event
+    |
+    |    Структура JSON данных события (параметр --props):
+    |    {
+    |     ""Описание""                : """", 
+    |     ""Заголовок""               : """", 
+    |     ""МестоПроведения""         : """", 
+    |     ""ДатаНачала""              : """",
+    |     ""ДатаОкончания""           : """",      
+    |     ""МассивURLФайловВложений"" :           
+    |         {
+    |          ""НазваниеФайла1"" : ""URLФайла1"",
+    |          ""НазваниеФайла2"" : ""URLФайла2"",
+    |          ...
+    |         },
+    |     ""ОтправлятьУведомления""   : true       
+    |    }
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -328,8 +345,8 @@
     НоваяСтрока.Модуль      = "OPI_GoogleCalendar";
     НоваяСтрока.Метод       = "CreateEvent";
     НоваяСтрока.МетодПоиска = "CREATEEVENT";
-    НоваяСтрока.Параметр    = "--Event description";
-    НоваяСтрока.Описание    = "props";
+    НоваяСтрока.Параметр    = "--props";
+    НоваяСтрока.Описание    = "Event description";
     НоваяСтрока.Область     = "Event management";
 
 
diff --git a/src/en/cli/data/Classes/internal/Classes/gdrive.os b/src/en/cli/data/Classes/internal/Classes/gdrive.os
index 1104881a94..1b8deaa440 100644
--- a/src/en/cli/data/Classes/internal/Classes/gdrive.os
+++ b/src/en/cli/data/Classes/internal/Classes/gdrive.os
@@ -101,7 +101,16 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "File and directory management";
-    НоваяСтрока.ОписаниеМетода   = "Uploads a file to the drive";
+    НоваяСтрока.ОписаниеМетода   = "Uploads a file to the drive
+    |
+    |    Структура JSON данных объекта (параметр --props):
+    |    {
+    |     ""MIME""        : ""image/jpeg"",
+    |     ""Имя""         : ""Новый файл.jpg"",
+    |     ""Описание""    : ""Это новый файл"",
+    |     ""Родитель""    : ""root""
+    |    }
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -119,8 +128,8 @@
     НоваяСтрока.Модуль      = "OPI_GoogleDrive";
     НоваяСтрока.Метод       = "UploadFile";
     НоваяСтрока.МетодПоиска = "UPLOADFILE";
-    НоваяСтрока.Параметр    = "--See GetFileDescription";
-    НоваяСтрока.Описание    = "props";
+    НоваяСтрока.Параметр    = "--props";
+    НоваяСтрока.Описание    = "JSON description or path to .json";
     НоваяСтрока.Область     = "File and directory management";
 
 
diff --git a/src/en/cli/data/Classes/internal/Classes/gsheets.os b/src/en/cli/data/Classes/internal/Classes/gsheets.os
index 1078f8d125..2563d449ed 100644
--- a/src/en/cli/data/Classes/internal/Classes/gsheets.os
+++ b/src/en/cli/data/Classes/internal/Classes/gsheets.os
@@ -204,7 +204,15 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "Data work";
-    НоваяСтрока.ОписаниеМетода   = "Sets sheet cell values";
+    НоваяСтрока.ОписаниеМетода   = "Sets sheet cell values
+    |
+    |    Структура JSON данных ячеек (параметр --data):
+    |    {
+    |     ""A1"": ""Это данные ячейки A1"",
+    |     ""B2"": ""Это данные ячейки B2"",
+    |     ...
+    |    }
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -222,8 +230,8 @@
     НоваяСтрока.Модуль      = "OPI_GoogleSheets";
     НоваяСтрока.Метод       = "SetCellValues";
     НоваяСтрока.МетодПоиска = "SETCELLVALUES";
-    НоваяСтрока.Параметр    = "--Fill data where the key is the cell name like A1";
-    НоваяСтрока.Описание    = "data";
+    НоваяСтрока.Параметр    = "--data";
+    НоваяСтрока.Описание    = "Fill data where the key is the cell name like A1";
     НоваяСтрока.Область     = "Data work";
 
 
diff --git a/src/en/cli/data/Classes/internal/Classes/notion.os b/src/en/cli/data/Classes/internal/Classes/notion.os
index f39db9d816..55ee791ba4 100644
--- a/src/en/cli/data/Classes/internal/Classes/notion.os
+++ b/src/en/cli/data/Classes/internal/Classes/notion.os
@@ -49,7 +49,15 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "Page management";
-    НоваяСтрока.ОписаниеМетода   = "Creates a page in the parent database";
+    НоваяСтрока.ОписаниеМетода   = "Creates a page in the parent database
+    |
+    |    Структура JSON данных страницы (параметр --data):
+    |    {
+    |     ""Имя поля БД 1""  : ""Значение1"",
+    |     ""Имя поля БД 2""  : ""Значение2"",
+    |     ...
+    |    }
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -67,8 +75,8 @@
     НоваяСтрока.Модуль      = "OPI_Notion";
     НоваяСтрока.Метод       = "CreatePageInDatabase";
     НоваяСтрока.МетодПоиска = "CREATEPAGEINDATABASE";
-    НоваяСтрока.Параметр    = "--Properties match";
-    НоваяСтрока.Описание    = "data";
+    НоваяСтрока.Параметр    = "--data";
+    НоваяСтрока.Описание    = "Properties map";
     НоваяСтрока.Область     = "Page management";
 
 
@@ -101,6 +109,14 @@
     НоваяСтрока.Параметр    = "--token";
     НоваяСтрока.Описание    = "Token";
     НоваяСтрока.Область     = "Page management";
+    НоваяСтрока.ОписаниеМетода   = "|
+    |    Структура JSON данных страницы (параметр --data):
+    |    {
+    |     ""Имя поля БД 1""  : ""Значение1"",
+    |     ""Имя поля БД 2""  : ""Значение2"",
+    |     ...
+    |    }
+    |";
 
 
     НоваяСтрока = ТаблицаСостава.Добавить();
@@ -118,8 +134,8 @@
     НоваяСтрока.Модуль      = "OPI_Notion";
     НоваяСтрока.Метод       = "EditPageProperties";
     НоваяСтрока.МетодПоиска = "EDITPAGEPROPERTIES";
-    НоваяСтрока.Параметр    = "--Matching of editable parameters";
-    НоваяСтрока.Описание    = "data (необяз. по ум. - Пустое значение)";
+    НоваяСтрока.Параметр    = "--data";
+    НоваяСтрока.Описание    = "Map of editable parameters (необяз. по ум. - Пустое значение)";
     НоваяСтрока.Область     = "Page management";
 
 
diff --git a/src/en/cli/data/Classes/internal/Classes/vk.os b/src/en/cli/data/Classes/internal/Classes/vk.os
index b6ea61660a..44f633f12b 100644
--- a/src/en/cli/data/Classes/internal/Classes/vk.os
+++ b/src/en/cli/data/Classes/internal/Classes/vk.os
@@ -1227,11 +1227,32 @@
     НоваяСтрока.Модуль      = "OPI_VK";
     НоваяСтрока.Метод       = "AddProduct";
     НоваяСтрока.МетодПоиска = "ADDPRODUCT";
-    НоваяСтрока.Параметр    = "--See GetProductDescription";
-    НоваяСтрока.Описание    = "product";
+    НоваяСтрока.Параметр    = "--product";
+    НоваяСтрока.Описание    = "JSON description of the product or path";
     НоваяСтрока.Область     = "Product management";
     НоваяСтрока.ОписаниеМетода   = "Adds a new product to the community's catalog
     |
+    |    Структура JSON данных описания товара (параметр --product):
+    |    {
+    |     ""Имя""                : ""Новый товар"",
+    |     ""Описание""           : ""Описание товара"",
+    |     ""Категория""          : ""20173"",
+    |     ""Цена""               : 1,
+    |     ""СтараяЦена""         : """",
+    |     ""ОсновноеФото""       : """",
+    |     ""URL""                : """",
+    |     ""ДополнительныеФото"" : [],
+    |     ""ЗначенияСвойств""    : [],
+    |     ""ГлавныйВГруппе""     : ""Ложь"",
+    |     ""Ширина""             : """",
+    |     ""Высота""             : """",
+    |     ""Глубина""            : """",
+    |     ""Вес""                : """",
+    |     ""SKU""                : """",
+    |     ""ДоступныйОстаток""   : ""1""
+    |    }
+    |
+    |
     |    Структура JSON данных авторизации (параметр --auth):
     |    {
     |     ""access_token"": """",
@@ -1272,6 +1293,27 @@
     НоваяСтрока.Область     = "Product management";
     НоваяСтрока.ОписаниеМетода   = "Edits a previously created product
     |
+    |    Структура JSON данных описания товара (параметр --product):
+    |    {
+    |     ""Имя""                : ""Новый товар"",
+    |     ""Описание""           : ""Описание товара"",
+    |     ""Категория""          : ""20173"",
+    |     ""Цена""               : 1,
+    |     ""СтараяЦена""         : """",
+    |     ""ОсновноеФото""       : """",
+    |     ""URL""                : """",
+    |     ""ДополнительныеФото"" : [],
+    |     ""ЗначенияСвойств""    : [],
+    |     ""ГлавныйВГруппе""     : ""Ложь"",
+    |     ""Ширина""             : """",
+    |     ""Высота""             : """",
+    |     ""Глубина""            : """",
+    |     ""Вес""                : """",
+    |     ""SKU""                : """",
+    |     ""ДоступныйОстаток""   : ""1""
+    |    }
+    |
+    |
     |    Структура JSON данных авторизации (параметр --auth):
     |    {
     |     ""access_token"": """",
@@ -1287,8 +1329,8 @@
     НоваяСтрока.Модуль      = "OPI_VK";
     НоваяСтрока.Метод       = "EditProduct";
     НоваяСтрока.МетодПоиска = "EDITPRODUCT";
-    НоваяСтрока.Параметр    = "--See GetProductDescription";
-    НоваяСтрока.Описание    = "product";
+    НоваяСтрока.Параметр    = "--product";
+    НоваяСтрока.Описание    = "JSON description of the product or path";
     НоваяСтрока.Область     = "Product management";