changed urls and templates names