Adapt more variable names to the common naming pattern