Refactor disc number methods

Just renaming all these different names for the same thing.