Fixed the renaming in remote class