started callback impl & fixed namings