Follow import conventions and add qualifiers