Change everything to use owner_customer instead of owner_account