Added elements as individuals of types using the suffix Element to replace Type.