Integration renaming
templates update
fix tests
integratin update