improved naming in pgn