Fix name and description treatment