Changed some names and messages - thanks @manishtomar