Fix naming tests (cherry picked from commit 78e0afae2f) Signed-off-by: Joshua Boniface <joshua@boniface.me>
78e0afae2f