Issue #6. Make generated inner class names comply with wiki documentation.