Motorola-Mobility/montage — pull request #932 by Stuk (2012-07-12 22:09:58+00:00)
Title: Class names update

supersedes gh-896

Rebased onto latest master and fixes @simurai's comments.

Cahnges to match convention in gh-795. Work issue: gh-867