Adjust naming to make things more consistent. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>