remove import function, rename attrs to upper in modules