Added backward compatibility for old NAME attribute.
Merge