some renaming in atoms following pylint a little better