Bug fixes on name squashes