Fix template block names