[BUGFIX] renamed some events to clearify the meaning