Issue #37 -- Bachelor -> Bachelor's thesis, Diploma -> Diploma thesis