endpoints -> devices renaming