Fixed missing template, renaming in the right way+