#716: Clean up variable names