Bundle quick and dirty fix

Rename, remove first line (start with services)
Here we should check for possible errors.