rename for importing, various bugfix