changing the names of vars so that they're exported