added export handling and fixed naming conventions