Diamond and graphite2 rename

TID(s):

Controller: 1.204s

Template: 0.154s

Cost: br=1.0, cc=1.712, ch=0.0, cm=0.0, cm+h=0.0, cr=0.0, cs=37.0, cw=25.0, dr=36251.0, dt=2.356, dw=0.0, gqr=0.0, in=27152.0, ir=2304.0, iw=0.0, lh=0.0, lm=8.0, lr=8.0, mcs=0.012, mcu=0.588, minflt=1346.0, mr=25.0, nivcsw=181.0, nreqs=52.0, nvcsw=527.0, pf=2.0, pr=0.0, stime=0.048, te=0.27, tf=0.525, tg=0.45, tm=1.121, tr=0.249, ts=0.0, tu=0.208, utime=1.664, va=104794.0