Change some property names
Update storage interface