change names, add hook, fix proxy