rename non-static vars