Device init: naming fixes