Fixes #34: Using Ore Dictionary Names everywhere it's possible and wanted.