Instead of deprecating this method add the prefix support to this method itself. This method is only being called in 4 places so making that update should be fairly straight forward. Add support for both empty/null prefix and if any value is sent like what we did in IEntityManager