Fix comments and variable names for atom wrapper.