7929: make it similar to previous…2 and rename files