Add TODO notes for better Rectification of names
  (http://en.wikipedia.org/wiki/Rectification_of_names)

Specifically for Media class