Change methods names and templates names
templates