Struct variable name cleanup.