Renamed ArrayPrimitiveTemplate and ArrayEmbedded to ArrayTemplatePrimitive and ArrayTemplateEmbedded.