Issue #2188613 by Berdir, Xen, andypost: Rename EntityStorageController to EntityStorage.