Rename 'Entity Storage Controller' to 'Entity Storage'.