Fix templates naming