Fixed issue with XRC names and buttons (for real this time).