#976 Fixed naming of layouts / templates