Fix callback and data name collision.