Merge "Yangman - strings to constants"