changing generic templates to match changes in new rapidsms