Improved code lisibility

Better respect of general conventions for the naming of variables.