Fixed colliding macro names and import names (#521)