LOW / Fix NPE, and rename file by resource