Fixed template naming to include path