Renames local variables for clarity.
Fix targets for renamed dependency.