Fix naming and Add warn messages