Rename storage to manager