Consolidate the use of the term "Blu-ray Disc"
Expanded filename prettifying