Make use of name convention utils

Really just the thing in the title :-)