Updated component template and json name