Renaming snaps to shorter and fixing bug