Some variable / struct member renaming for greater clarity.