Cleaned up slot names for section caches.
Cleaned up identifiers related to imports.