More changes for rename of Trajectory class and fix a compiler error in Visual Studio in the manipulation tab