Fix #562 - s/before/onBeforeAction/, same for after