Fix package calls in all templates