Forced named in cache to be uppercased and fixed some syntax errors