fix name and mocule imports