Better names
Make gendarme happy, part 1