name corrections
merge