Refactor method names.
Rework trigger structure and generation.