Fixes SERVICE_NAME & NAME variables mixup, fixes a typo