Little improvements in naming and labels