Convert inner-classes to have 'Element' suffix to match.
Merge pull request #67 from square/jw/more-elementization

Convert inner-classes to have 'Element' suffix to match.