Feature class name and hierarchy refactoring for consistency
95 files changed