That's what I did. Choose Samsung and the model number. I did have to tweak a few buttons to get it to fully work correctly. In my case, my 610 has hard buttons for Red, Green, Yellow and Blue along with most other functions. I used the selectable "soft" buttons for the Pop-Up, Bookmark and Disc Menu and Eject functions.
I also manually added controls for volume to the BD function set that control my AVR. I'm not sure why it didn't add that function to all devices since it specifically asked me how volume would be controlled. Instead, it left the volume controls blank for any device that doesn't normally have them (BD, DVR, etc.). I didn't want to have to switch modes to raise or lower the volume, so I applied it to all devices.