Fix package name
Centralise lifecycle handling, fix backup type