Make some var names more robust.