Changed template attributes to be consistent __name__ and __collection__.
Fixed injection issue