restructured member variable names

11 files changed