cleanup template names and locations