Re #129 Rename some variables after merge