Restructure and rename entity auto pages