rename primary module object for better understanding
update tests to adapt to object name changes