[common, utils] atom names clean up