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