Rename

Rename
Avoid infinite loop on errors
Added version
Avoid console errors