Fix naming before @keepcalm444 commits again