Reverted separate attributes - service_name is used both to refer to the service and the package, this with the service name not being needed on windows, makes the most sense.