Merge "rename pulled atoms to shorter names"