Thomas and Justin's proper file and folder names patch