Changed callbacks names