rename hierarchy objects for consistency and clarity