Cleaned up variable name conversion