Change ambiguous variable name
Fix compilation error caused by wrong imports