rename pulled atoms to shorter names

Test: unit test
Change-Id: I337341dc69ea658f5972cd9962c536a1f11d77f9
7 files changed