minor struct name changes