Correctly Convert Projects with Underscores in block type names.

Change-Id: Ib7d2f0604d727aaf795fe60a2707cc975023cbef