First part of commit for redesigned SIMD module - namechanges.