Further changes to ActivitySchedule, there were some duplicate named
variables