issue #2323, rename file name to meet conventions