renamed Disk* references to GcpDisk*