Updating word choices for how to structure things in the atomic library.