Rename accountId to remoteOptionId for better clarity