Refactor wallet_account to account, to match configs