Merge "Do not use self.name for volume name field"