interface improved, renaming done