Variable and sub names cleanup.