switch to tp smapi conventions