Fixed dependecies.

talk/base content does not exist anymore.
This has led to some naming changes as well.