Fixed name checking