Keyword change for clarity
IBAN structure updater produces better code
XML structure fix
Lint fixes