Switching to variable names matching those in dependencies.