ENYO-2512: Camelize some variable names