Implemented modification to the naming scheme propose in hangout