unify some sammies

Change-Id: I16be5c7398e54940c23d818e6e9be565cba844d7