From the looks of both articles (the multiple editions article, and the naming your movies article), it looks like you named the folder correctly. I don’t know if the lack of a year for the movie is an issue, but I’d expect it wouldn’t be necessary… Wouldn’t hurt to try and include them to be sure.
But how are the files themselves named? Files within a folder also have to have the {edition-EDITIONTYPE} tag on the end of the filename as well. I doubt you’d have missed that, but I just want to be sure.