Name and module import cleanup