Device mod.: update some macro param names to maintain coherence