New names for initial deps and topics

This will hopefully remove some of the confusion from the repeated
names in the various initial data