Cleanup var names
Prepare for import to galaxy