Cleaned up variable names to eliminate "illegal" characters.