renamed some modules and variables