Use unified rule for command names