Changed name from ExpansionFile to ExpansionStorage