* fix naming
* fix notification