Code

Cleaned up some internal type names.