device-manager: More sensible names for internal functions