549: rename some vars