More naming consistency fixes
Passed
Oscar Gustafsson
created pipeline for commit
7c999b27
, finished
For master
6 minutes 19 seconds, queued for 5 seconds