better naming, export fixed