* modified some struct names for better understanding/consistency