Merge "Correct the atoms.proto name"