MDL-22056 simplified string name handling