Changed attribute names to reduce risk of name collision in derived classes, and required edits overlooked during recent restructuring
Changed attribute names to reduce risk of name collision in derived classes,
and required edits overlooked during recent restructuring

bwohlberg/sporco,bwohlberg/sporco