Rename storage classes to Template