Rename off stuff and fixed dynamic loader