Rename some variables to avoid possible clashes