Updated some names

Experiment: swap d and g