Changed some names trying to comply with OreDictionary