some BS3 renaming