refactor: Use life cycle unhypenated
2 files changed