Fixed template naming
Random updates