PTs and Maps now also named in proper order.