Fix missing underscore conversions

Fix missing scope conversions and replace the Cli conversion method by a new one which returns a string.