Now handles IRIS naming scheme