Added code to handle multiple 'name' versions in DB