Correct several binary PSOs

Rename variables to match the articles and one minor implementation correction.