Smashed and adjusted part names, added pin annotation