Switched to always use 'tiploc' where apropriate for clarity