Adapt some variable names to the common naming pattern