Element Naming Restructure

Elements have been altered to have the variant type after the main element name.

Example, Supported Marathon changed to Marathon (Supported)