Re #1296 Renaming internals in Provider/Dataset API.