Need to do capitalization changes in dict keys from rev 45d2012fcf51 for all usages