Add path and improve variable names to avoid conflicts late.