Ensure consistent treatment of account name.
Simplify variale names to make easier to understand code