Cleanup member variable names