verbose_name cleanups (#416)