Fix #65: USE ALL UPPERCASE FOR NAMES