Merge "Fix the typos and naming convention in atoms.proto"