BGI2 naming issues resolved (2)