fixed import names for rust0.11-pre compatibility