Fix build break due to import shadowing