Bring Abizer's earlier tweak to method names