Refactored names to better distinguish various types of config/metadata,
and to reduce use of nonstandard "m_" prefix.