red-brick: Adapt to changed UNIX domain socket name of redapid
Rename some variables