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

@swankjesse 

Just another mechanical rename.