name improvement and files correction