Several fixes to the velocity templates (so they can be compliant with the components ontology)