Replace some fully qualified type names with imports