fixed various bugs to do with snap-naming