Rename listing providers and clean up