Make imports consistent