move and rename some vars