Better naming in endgame code