Merge "Make ACCOUNT_NAME/ACCOUNT_TYPE consistent."