change naming scheme to avoid long filename