Changes for renaming of Trajectory class