uniformize variable names and remove duplicating fields in private structs