Make app and service instance names unique

Also delete app and service_instance in an after

[#52842425]