More consistency with variables names