diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js
index b71f924f28..a2a91d066e 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-dateoffsets.js
@@ -392,7 +392,7 @@ export default function (f7) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_zdt_temporal_unit_input'] = function (block) {
-    const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
+    const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
     return [`(${value})`, javascriptGenerator.ORDER_NONE]
   }
 
@@ -518,7 +518,7 @@ export default function (f7) {
   }
 
   javascriptGenerator.forBlock['oh_zdt_amend'] = function (block) {
-    const baseZdt = javascriptGenerator.valueToCode(block, 'baseZdt', javascriptGenerator.ORDER_ATOMIC)
+    const baseZdt = valueToCode(block, 'baseZdt', javascriptGenerator.ORDER_ATOMIC)
     const operation = block.getFieldValue('operation')
 
     let code = baseZdt
@@ -533,7 +533,7 @@ export default function (f7) {
     if (operationBlock) {
       let i
       for (i = 0; i < this.itemCount_; i++) {
-        let temporal = javascriptGenerator.valueToCode(block, 'ADD' + i, javascriptGenerator.ORDER_ATOMIC)
+        let temporal = valueToCode(block, 'ADD' + i, javascriptGenerator.ORDER_ATOMIC)
         temporal = temporal.replace(/\(/g, '').replace(/\)/g, '')
 
         let inputBlock = this.getInputTargetBlock('ADD' + i)
@@ -637,7 +637,7 @@ export default function (f7) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_zdt_toText'] = function (block) {
-    const date = javascriptGenerator.valueToCode(block, 'date', javascriptGenerator.ORDER_ATOMIC)
+    const date = valueToCode(block, 'date', javascriptGenerator.ORDER_ATOMIC)
     const withtime = block.getFieldValue('withtime')
 
     let code = ''
@@ -646,7 +646,7 @@ export default function (f7) {
     } else if (withtime === 'without') {
       code = `${date}.format(time.DateTimeFormatter.ofPattern('yyyy-MM-dd'))`
     } else if (withtime === 'withPattern') {
-      const pattern = javascriptGenerator.valueToCode(block, 'pattern', javascriptGenerator.ORDER_ATOMIC)
+      const pattern = valueToCode(block, 'pattern', javascriptGenerator.ORDER_ATOMIC)
       code = `${date}.format(time.DateTimeFormatter.ofPattern(${pattern}))`
     } else {
       code = `${date}.format(time.DateTimeFormatter.ofPattern('yyyy-MM-dd\\'T\\'HH:mm:ss.SSSZ'))`
@@ -688,8 +688,8 @@ export default function (f7) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_zdt_compare'] = function (block) {
-    const zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
-    const zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
+    const zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
+    const zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
     const operation = block.getFieldValue('operation')
     const precision = block.getFieldValue('precision')
     const dateComparison = block.getFieldValue('dateComparison')
@@ -731,9 +731,9 @@ export default function (f7) {
   */
   javascriptGenerator.forBlock['oh_zdt_between'] = function (block) {
     let zdtCompare = addDateComparisonSupport()
-    let zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
-    let zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
-    let zdtThree = javascriptGenerator.valueToCode(block, 'zdtThree', javascriptGenerator.ORDER_ATOMIC)
+    let zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
+    let zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
+    let zdtThree = valueToCode(block, 'zdtThree', javascriptGenerator.ORDER_ATOMIC)
     let dateComparison = block.getFieldValue('dateComparison')
 
     const op = new Map([['dateandtime', 'isBetweenDateTimes'], ['date', 'isBetweenDates'], ['time', 'isBetweenTimes']]).get(dateComparison)
@@ -764,7 +764,7 @@ export default function (f7) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_get_zdt_part'] = function (block) {
-    const zdt = javascriptGenerator.valueToCode(block, 'zdt', javascriptGenerator.ORDER_ATOMIC)
+    const zdt = valueToCode(block, 'zdt', javascriptGenerator.ORDER_ATOMIC)
     let temporalPart = block.getFieldValue('temporalPart')
 
     const op = new Map([['getYear', 'year'], ['getMonthValue', 'monthValue'], ['getDayOfMonth', 'dayOfMonth'], ['getDayOfWeek', 'dayOfWeek().value'], ['getDayOfYear', 'dayOfYear'], ['getHour', 'hour'], ['getMinute', 'minute'], ['getSecond', 'second'], ['getNanoTotal', 'get(time.ChronoField.NANO_OF_SECOND)']])
@@ -816,8 +816,8 @@ export default function (f7) {
   */
   javascriptGenerator.forBlock['oh_get_time_between'] = function (block) {
     const temporalPart = block.getFieldValue('temporalPart')
-    const zdtOne = javascriptGenerator.valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
-    const zdtTwo = javascriptGenerator.valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
+    const zdtOne = valueToCode(block, 'zdtOne', javascriptGenerator.ORDER_ATOMIC)
+    const zdtTwo = valueToCode(block, 'zdtTwo', javascriptGenerator.ORDER_ATOMIC)
 
     const code = `time.ChronoUnit.${temporalPart}.between(${zdtOne},${zdtTwo})`
     return [code, javascriptGenerator.ORDER_NONE]
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js
index de5061ee11..fa9c241ae3 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-items.js
@@ -153,7 +153,7 @@ export default function (f7) {
   }
 
   javascriptGenerator.forBlock['oh_getitem_state'] = function (block) {
-    const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
+    const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
     return [`items.getItem(${itemName}).state`, 0]
   }
 
@@ -257,7 +257,7 @@ export default function (f7) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_getitem_attribute'] = function (block) {
-    const theItem = javascriptGenerator.valueToCode(block, 'item', javascriptGenerator.ORDER_ATOMIC)
+    const theItem = valueToCode(block, 'item', javascriptGenerator.ORDER_ATOMIC)
     const inputType = blockGetCheckedInputType(block, 'item')
     let attributeName = block.getFieldValue('attributeName')
 
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js
index d98f86de0d..6e3b038289 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-math.js
@@ -153,7 +153,7 @@ export default function (f7) {
     if (inputType === 'oh_quantity') {
       math_number = math_number_input + '.float'
     }
-    const decimals = javascriptGenerator.valueToCode(block, 'DECIMALS', javascriptGenerator.ORDER_NONE)
+    const decimals = valueToCode(block, 'DECIMALS', javascriptGenerator.ORDER_NONE)
     const operand = block.getFieldValue('op')
 
     let code
@@ -218,7 +218,7 @@ export default function (f7) {
 
   javascriptGenerator.forBlock['math_single'] = function (block) {
     const inputType = blockGetCheckedInputType(block, 'NUM')
-    const math_number_input = javascriptGenerator.valueToCode(block, 'NUM', javascriptGenerator.ORDER_FUNCTION_CALL)
+    const math_number_input = valueToCode(block, 'NUM', javascriptGenerator.ORDER_FUNCTION_CALL)
     let math_number = math_number_input
     if (inputType === 'oh_quantity') {
       math_number = math_number_input + '.float'
@@ -301,8 +301,8 @@ export default function (f7) {
     const wasInitialized = javascriptGenerator.isInitialized
     try {
       javascriptGenerator.isInitialized = 1 // workaround to avoid console warnings
-      math_number_input1 = javascriptGenerator.valueToCode(block, 'NUM1', javascriptGenerator.ORDER_FUNCTION_CALL)
-      math_number_input2 = javascriptGenerator.valueToCode(block, 'NUM2', javascriptGenerator.ORDER_FUNCTION_CALL)
+      math_number_input1 = valueToCode(block, 'NUM1', javascriptGenerator.ORDER_FUNCTION_CALL)
+      math_number_input2 = valueToCode(block, 'NUM2', javascriptGenerator.ORDER_FUNCTION_CALL)
     } catch (e) {
       // may throw an exception on workspace startup in uninitialized state but in this case we can ignore
     } finally {
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js
index 2c3d1f9434..a8ce42d122 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-metadata.js
@@ -61,7 +61,7 @@ export default function (f7) {
   javascriptGenerator.forBlock['oh_get_meta_config'] = function (block) {
     const configKey = valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC)
     const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
-    const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
+    const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
     addGetItemMetaConfigValue()
     return [`getItemMetaConfigValue(${theItem}, ${namespace}, ${configKey})`, javascriptGenerator.ORDER_CONDITIONAL]
   }
@@ -94,9 +94,9 @@ export default function (f7) {
   }
 
   javascriptGenerator.forBlock['oh_store_meta_value'] = function (block) {
-    const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
-    const theItem = javascriptGenerator.valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
-    const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
+    const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
+    const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
+    const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
 
     let itemMeta = addItemMeta()
     let code = `${itemMeta} = items.metadata.getMetadata(${theItem}, ${namespace});\n`
@@ -137,10 +137,10 @@ export default function (f7) {
   }
 
   javascriptGenerator.forBlock['oh_store_meta_config'] = function (block) {
-    const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
-    const configKey = javascriptGenerator.valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC).replaceAll('\'', '')
-    const theItem = javascriptGenerator.valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
-    const namespace = javascriptGenerator.valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
+    const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
+    const configKey = valueToCode(block, 'configKey', javascriptGenerator.ORDER_ATOMIC).replaceAll('\'', '')
+    const theItem = valueToCode(block, 'theItem', javascriptGenerator.ORDER_ATOMIC)
+    const namespace = valueToCode(block, 'namespace', javascriptGenerator.ORDER_ATOMIC)
 
     let itemMeta = addItemMeta()
     let code = `${itemMeta} = items.metadata.getMetadata(${theItem}, ${namespace});\n`
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js
index ce2321cd9b..2e912dc6b1 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-notifications.js
@@ -316,22 +316,22 @@ export default function defineOHBlocks_Notifications (f7) {
   }
 
   javascriptGenerator.forBlock['oh_sendCloudNotification'] = function (block) {
-    const message = javascriptGenerator.valueToCode(block, 'message', javascriptGenerator.ORDER_ATOMIC)
+    const message = valueToCode(block, 'message', javascriptGenerator.ORDER_ATOMIC)
     const type = block.getFieldValue('type')
-    const icon = javascriptGenerator.valueToCode(block, 'icon', javascriptGenerator.ORDER_ATOMIC)
-    const tag = javascriptGenerator.valueToCode(block, 'tag', javascriptGenerator.ORDER_ATOMIC)
-    const headerTitle = javascriptGenerator.valueToCode(block, 'headerTitle', javascriptGenerator.ORDER_ATOMIC)
-    const reference = javascriptGenerator.valueToCode(block, 'reference', javascriptGenerator.ORDER_ATOMIC)
-    const media = javascriptGenerator.valueToCode(block, 'media', javascriptGenerator.ORDER_ATOMIC)
-    const action = javascriptGenerator.valueToCode(block, 'action', javascriptGenerator.ORDER_ATOMIC)
+    const icon = valueToCode(block, 'icon', javascriptGenerator.ORDER_ATOMIC)
+    const tag = valueToCode(block, 'tag', javascriptGenerator.ORDER_ATOMIC)
+    const headerTitle = valueToCode(block, 'headerTitle', javascriptGenerator.ORDER_ATOMIC)
+    const reference = valueToCode(block, 'reference', javascriptGenerator.ORDER_ATOMIC)
+    const media = valueToCode(block, 'media', javascriptGenerator.ORDER_ATOMIC)
+    const action = valueToCode(block, 'action', javascriptGenerator.ORDER_ATOMIC)
     const actionType = (action !== '') ? blockGetCheckedInputType(block, 'action') : undefined
-    const actionButton1 = javascriptGenerator.valueToCode(block, 'actionButton1', javascriptGenerator.ORDER_ATOMIC)
+    const actionButton1 = valueToCode(block, 'actionButton1', javascriptGenerator.ORDER_ATOMIC)
     const actionButton1Type = (actionButton1 !== '') ? blockGetCheckedInputType(block, 'actionButton1') : undefined
-    const actionButton2 = javascriptGenerator.valueToCode(block, 'actionButton2', javascriptGenerator.ORDER_ATOMIC)
+    const actionButton2 = valueToCode(block, 'actionButton2', javascriptGenerator.ORDER_ATOMIC)
     const actionButton2Type = (actionButton2 !== '') ? blockGetCheckedInputType(block, 'actionButton2') : undefined
-    const actionButton3 = javascriptGenerator.valueToCode(block, 'actionButton3', javascriptGenerator.ORDER_ATOMIC)
+    const actionButton3 = valueToCode(block, 'actionButton3', javascriptGenerator.ORDER_ATOMIC)
     const actionButton3Type = (actionButton3 !== '') ? blockGetCheckedInputType(block, 'actionButton3') : undefined
-    const users = javascriptGenerator.valueToCode(block, 'usersInput', javascriptGenerator.ORDER_ATOMIC)
+    const users = valueToCode(block, 'usersInput', javascriptGenerator.ORDER_ATOMIC)
 
     function getActionButtonCode (titleAndAction, buttonActionType) {
       let actionButtonCode
@@ -384,8 +384,8 @@ export default function defineOHBlocks_Notifications (f7) {
   }
 
   javascriptGenerator.forBlock['oh_cloudNotificationButton'] = function (block) {
-    const label = javascriptGenerator.valueToCode(block, 'label', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
-    const action = javascriptGenerator.valueToCode(block, 'action', javascriptGenerator.ORDER_ATOMIC)
+    const label = valueToCode(block, 'label', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
+    const action = valueToCode(block, 'action', javascriptGenerator.ORDER_ATOMIC)
     return [`.addActionButton('${label}', ${action})`, javascriptGenerator.ORDER_ATOMIC]
   }
 
@@ -409,9 +409,9 @@ export default function defineOHBlocks_Notifications (f7) {
   }
 
   javascriptGenerator.forBlock['oh_cloudNotification_commandAction'] = function (block) {
-    const command = javascriptGenerator.valueToCode(block, 'command', javascriptGenerator.ORDER_ATOMIC)
+    const command = valueToCode(block, 'command', javascriptGenerator.ORDER_ATOMIC)
     const commandType = (command !== '') ? blockGetCheckedInputType(block, 'command') : undefined
-    const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
+    const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
     const itemType = (itemName !== '') ? blockGetCheckedInputType(block, 'itemName') : undefined
     const commandCode = '\'command:' +
       ((itemType === '') ? '\' + ' + itemName + ' + \':\' ' : `${itemName}:'`) +
@@ -451,7 +451,7 @@ export default function defineOHBlocks_Notifications (f7) {
 
   javascriptGenerator.forBlock['oh_cloudNotification_uiAction'] = function (block) {
     const command = block.getFieldValue('command')
-    const path = javascriptGenerator.valueToCode(block, 'path', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
+    const path = valueToCode(block, 'path', javascriptGenerator.ORDER_ATOMIC).replace(/'/g, '')
     const pathType = (path !== '') ? blockGetCheckedInputType(block, 'path') : undefined
     const pathCode = (pathType === '') ? ' + ' + path : ` + '${path}'`
     const uiActionCode = `'${command}'${pathCode}`
@@ -474,8 +474,8 @@ export default function defineOHBlocks_Notifications (f7) {
   }
 
   javascriptGenerator.forBlock['oh_hideCloudNotification'] = function (block) {
-    const reference = javascriptGenerator.valueToCode(block, 'reference', javascriptGenerator.ORDER_ATOMIC)
-    const tag = javascriptGenerator.valueToCode(block, 'tag', javascriptGenerator.ORDER_ATOMIC)
+    const reference = valueToCode(block, 'reference', javascriptGenerator.ORDER_ATOMIC)
+    const tag = valueToCode(block, 'tag', javascriptGenerator.ORDER_ATOMIC)
     const tagCode = (tag === '') ? '' : `.withTag(${tag})`
     const referenceCode = (reference === '') ? '' : `.withReferenceId(${reference})`
     return `actions.notificationBuilder("hide notification")${referenceCode}${tagCode}.hide().send();\n`
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-persistence.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-persistence.js
index 44a70f7e67..b3235ea1e6 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-persistence.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-persistence.js
@@ -472,7 +472,7 @@ export default function defineOHBlocks_Persistence (f7, persistenceServices) {
     const dayInfo1 = valueToCode(block, 'dayInfo', javascriptGenerator.ORDER_NONE)
     const dayInfo2 = methodName.endsWith('Between') ? valueToCode(block, 'dayInfo2', javascriptGenerator.ORDER_NONE) : undefined
     const dayInfo = dayInfo2 ? `${dayInfo1}, ${dayInfo2}` : dayInfo1
-    const persistenceName = javascriptGenerator.valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
+    const persistenceName = valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
     const persistenceExtension = (persistenceName === '\'default\'') ? '' : `, ${persistenceName}`
 
     let itemCode = generateItemCode(itemName, inputType)
@@ -526,9 +526,9 @@ export default function defineOHBlocks_Persistence (f7, persistenceServices) {
   */
   javascriptGenerator.forBlock['oh_get_persistence_lastupdate'] = function (block) {
     const methodName = block.getFieldValue('methodName')
-    const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
+    const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
     const inputType = blockGetCheckedInputType(block, 'itemName')
-    const persistenceName = javascriptGenerator.valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
+    const persistenceName = valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
     const persistenceExtension = (persistenceName === '\'default\'') ? '' : `${persistenceName}`
     const itemCode = generateItemCode(itemName, inputType)
 
@@ -652,17 +652,17 @@ export default function defineOHBlocks_Persistence (f7, persistenceServices) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_persist'] = function (block) {
-    const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
+    const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
     const inputType = blockGetCheckedInputType(block, 'itemName')
     const itemCode = generateItemCode(itemName, inputType)
 
     const persistType = block.getFieldValue('persistType')
 
-    const states = javascriptGenerator.valueToCode(block, 'states', javascriptGenerator.ORDER_ATOMIC)
-    const at = javascriptGenerator.valueToCode(block, 'at', javascriptGenerator.ORDER_NONE)
+    const states = valueToCode(block, 'states', javascriptGenerator.ORDER_ATOMIC)
+    const at = valueToCode(block, 'at', javascriptGenerator.ORDER_NONE)
     const policy = persistType.endsWith('REPLACE') ? 'REPLACE' : 'ADD'
 
-    const persistenceName = javascriptGenerator.valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
+    const persistenceName = valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
     const persistenceExtension = (persistenceName === '\'default\'') ? '' : `, ${persistenceName}`
 
     let code = ''
@@ -809,17 +809,17 @@ export default function defineOHBlocks_Persistence (f7, persistenceServices) {
   * Code part
   */
   javascriptGenerator.forBlock['oh_delete_persistedvalues'] = function (block) {
-    const itemName = javascriptGenerator.valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
+    const itemName = valueToCode(block, 'itemName', javascriptGenerator.ORDER_ATOMIC)
     const inputType = blockGetCheckedInputType(block, 'itemName')
     const itemCode = generateItemCode(itemName, inputType)
 
     const methodName = block.getFieldValue('methodName')
 
-    const dayInfoSince = javascriptGenerator.valueToCode(block, 'dayInfoSince', javascriptGenerator.ORDER_NONE)
-    const dayInfoUntil = javascriptGenerator.valueToCode(block, 'dayInfoUntil', javascriptGenerator.ORDER_NONE)
+    const dayInfoSince = valueToCode(block, 'dayInfoSince', javascriptGenerator.ORDER_NONE)
+    const dayInfoUntil = valueToCode(block, 'dayInfoUntil', javascriptGenerator.ORDER_NONE)
     const dayInfo = dayInfoSince + ((dayInfoSince && dayInfoUntil) ? ' ,' : '') + dayInfoUntil
 
-    const persistenceName = javascriptGenerator.valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
+    const persistenceName = valueToCode(block, 'persistenceName', javascriptGenerator.ORDER_NONE)
     const persistenceExtension = (persistenceName === '\'default\'') ? '' : `, ${persistenceName}`
 
     const code = `${itemCode}.persistence.${methodName}(${dayInfo}${persistenceExtension});\n`
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
index 085dbab37c..b57669a171 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-scripts.js
@@ -397,7 +397,7 @@ export default function defineOHBlocks_Scripts (f7, transformationServices) {
   javascriptGenerator.forBlock['oh_rule_return'] = function (block) {
     // we need to enable the wrapper to allow returning from the rule
     javascriptGenerator.provideFunction_('wrapper', ['"use wrapper;"'])
-    const value = javascriptGenerator.valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
+    const value = valueToCode(block, 'value', javascriptGenerator.ORDER_ATOMIC)
     return `return ${value} \n`
   }
 }
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-timers.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-timers.js
index 8580ad0fa9..57d8c84908 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-timers.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-timers.js
@@ -160,10 +160,10 @@ export default function defineOHBlocks_Timers (f7) {
   javascriptGenerator.forBlock['oh_timer_ext'] = function (block) {
     const delayUnits = block.getFieldValue('delayUnits')
     const delay = valueToCode(block, 'delay', javascriptGenerator.ORDER_ATOMIC)
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const timerCode = statementToCode(block, 'timerCode')
     const retrigger = block.getFieldValue('retrigger')
-    const context = javascriptGenerator.valueToCode(block, 'context', javascriptGenerator.ORDER_ATOMIC)
+    const context = valueToCode(block, 'context', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
 
     let code = `if (cache.${cacheType}.exists(${timerName}) === false || cache.${cacheType}.get(${timerName}).hasTerminated()) {\n`
@@ -215,7 +215,7 @@ export default function defineOHBlocks_Timers (f7) {
   * Code generation
   */
   javascriptGenerator.forBlock['oh_timer_isActive'] = function (block) {
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
     return [`cache.${cacheType}.exists(${timerName}) && cache.${cacheType}.get(${timerName}).isActive()`, javascriptGenerator.ORDER_NONE]
   }
@@ -248,7 +248,7 @@ export default function defineOHBlocks_Timers (f7) {
   */
   javascriptGenerator.forBlock['oh_timer_isRunning'] = function (block) {
     // Keep the isRunning block although it doesn't make sense because in GraalJS access to the context is synchronized and therefore it is not possible to run some code the same time a timer is running
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
     return [`cache.${cacheType}.exists(${timerName}) && cache.${cacheType}.get(${timerName}).isRunning()`, javascriptGenerator.ORDER_NONE]
   }
@@ -280,7 +280,7 @@ export default function defineOHBlocks_Timers (f7) {
   * Code generation
   */
   javascriptGenerator.forBlock['oh_timer_hasTerminated'] = function (block) {
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
     return [`cache.${cacheType}.exists(${timerName}) && cache.${cacheType}.get(${timerName}).hasTerminated()`, javascriptGenerator.ORDER_NONE]
   }
@@ -311,7 +311,7 @@ export default function defineOHBlocks_Timers (f7) {
   * Code generation
   */
   javascriptGenerator.forBlock['oh_timer_cancel'] = function (block) {
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
     return `if (cache.${cacheType}.exists(${timerName})) { cache.${cacheType}.remove(${timerName}).cancel(); };\n`
   }
@@ -350,8 +350,8 @@ export default function defineOHBlocks_Timers (f7) {
   */
   javascriptGenerator.forBlock['oh_timer_reschedule'] = function (block) {
     const delayUnits = block.getFieldValue('delayUnits')
-    const delay = javascriptGenerator.valueToCode(block, 'delay', javascriptGenerator.ORDER_ATOMIC)
-    const timerName = javascriptGenerator.valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
+    const delay = valueToCode(block, 'delay', javascriptGenerator.ORDER_ATOMIC)
+    const timerName = valueToCode(block, 'timerName', javascriptGenerator.ORDER_ATOMIC)
     const cacheType = getCacheType(this)
     return `if (cache.${cacheType}.exists(${timerName})) { cache.${cacheType}.get(${timerName}).reschedule(time.ZonedDateTime.now().${delayUnits}(${delay})); };\n`
   }
diff --git a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-uom.js b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-uom.js
index 45c1b13ce7..8a142dc532 100644
--- a/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-uom.js
+++ b/bundles/org.openhab.ui/web/src/assets/definitions/blockly/blocks-uom.js
@@ -146,8 +146,8 @@ export default function (f7) {
   }
 
   javascriptGenerator.forBlock['oh_quantity_to_unit'] = function (block) {
-    const quantity = javascriptGenerator.valueToCode(block, 'quantity', javascriptGenerator.ORDER_NONE)
-    const unit = javascriptGenerator.valueToCode(block, 'unit', javascriptGenerator.ORDER_NONE)
+    const quantity = valueToCode(block, 'quantity', javascriptGenerator.ORDER_NONE)
+    const unit = valueToCode(block, 'unit', javascriptGenerator.ORDER_NONE)
     return [`${quantity}.toUnit(${unit})`, javascriptGenerator.ORDER_NONE]
   }
 }
@@ -161,7 +161,7 @@ export default function (f7) {
  * @returns {string} generated Quantity code
  */
 function generateQuantityCode (block, inputName) {
-  const input = javascriptGenerator.valueToCode(block, inputName, javascriptGenerator.ORDER_NONE)
+  const input = valueToCode(block, inputName, javascriptGenerator.ORDER_NONE)
   const inputType = blockGetCheckedInputType(block, inputName)
 
   let code = ''