Completed splitting out dispatch from slice

Shortened names which contain the namespace in the name.