Rename, more compatibility with original version