Fixed variables naming in exports