Fix name and text