changed membervariable names to follow m_name