Trivial - renaming stuff to better express what's it for.
This gets a bit more complex with the beginnings of discovery support.