SV renaming and bug fix