added .name element and appropriate padding