Quick change of variable names

Changed variable names to avoid conflicts