Tweak names and indentation to fit better in 80 columns