Rename storage layer objects to be more sensible.