Rename private member and variables