modify the name of handlers