Code/Control names cleanup.