Updated to remove potential namespace conflicts on trajectory definitions