Switched name checking order