renaming, debugging
fix import with renamed files
import spelling fix