Atomic mass
The term "atomic weight" is being phased out slowly and being replaced by "relative atomic mass", in most current usage. This shift in nomenclature reaches back to the 1960s and has been the source of much debate in the scientific community, which was triggered by the adoption of the unified atomic mass unit and the realization that weight was in some ways an inappropriate term. The argument for keeping the term "atomic weight" was primarily that it was a well understood term to those in the field, that the term "atomic mass" was already in use (as it is currently defined) and that the term "relative atomic mass" might be easily confused with "relative isotopic mass" (the mass of a single atom of a given nuclide, expressed dimensionlessly relative to 1/12 of the mass of carbon-12; see section above).
Matter
In classical physics and general chemistry, matter is any substance that has mass and takes up space by having volume. All everyday objects that can be touched are ultimately composed of atoms, which are made up of interacting subatomic particles, and in everyday as well as scientific usage, "matter" generally includes atoms and anything made up of them, and any particles (or combination of particles) that act as if they have both rest mass and volume. However it does not include massless particles such as photons, or other energy phenomena or waves such as light or sound. Matter exists in various states (also known as phases). These include classical everyday phases such as solid, liquid, and gas – for example water exists as ice, liquid water, and gaseous steam – but other states are possible, including plasma, Bose–Einstein condensates, fermionic condensates, and quark–gluon plasma.