Small naming update

Updated naming and also added a bit to do with the OreDictionary