changed name, fixed name template