Slightly better name and location for NumberingStyles

Change-Id: Ib5ec7e3bc75a775d2601ecf1b7c65d7dbdcb495b