Correct submission templates