Change name of clashing 'packages' variables