Update to uppercase and some stray references