Coding conventions (removing _ from names) (Laurent)