Clean up naming in infrastructure template