Always use long name for variable types.

[#65125966]