Fix usage message and name filter

Change-Id: Ifeb3255f5b0e6c8c39860003f03b29d7339fcb69