fix #267
fix #266
only use fully qualified names for type and member definitions