Make extension imports consistent