Connecting to Common Data Service Entities and Columns with Same Name

I am trying to connect to custom entities in Common Data Service to build reports for a Model-driven app.

It appears that if your entity name is the same as a field name (for example entity called new_department and you change the primary field from "name" to "department", so there ends up being a new_department field) then Power BI can't find the field.

From what I've researched, the api, when faced with this issue, applies a 1 to the field name under the covers. So ostensibly, the name of your field and entity are both new_department, but according to the api the field is named new_department1.

Somehow, Power BI is unable to recognize this, and subsequently the troublesome field just won't show up.

Anyone else ever encounter this? Any ideas on how to fix it or work around it? Rebuilding the entities is not an option. Anyone from Microsoft know if this is a known issue?