Custom Doc areatemplate name/index refactoring