more harmonious naming, plus more implementation of conneg. abbrevs for common modules