Names fixed in cc23d573f3172cb4543615f633e026842938e613, the use of Common::String is still to be handled or discussed