Fix discovery and rename resources to datasets