Name fix / Reducing file size