Rename template package and template class
Bug in destroy method