Further work standardising variable names