Add NAME attribute
Version 0.27